disable pwm7

hc

2024-05-10 23fa18eaa71266feff7ba8d83022d9e1cc83c65a

 kernel/arch/alpha/include/asm/io.h
..
..
@@ -7,7 +7,6 @@
7
7
 #include <linux/kernel.h>
8
8
 #include <linux/mm.h>
9
9
 #include <asm/compiler.h>
10
-#include <asm/pgtable.h>
11
10
 #include <asm/machvec.h>
12
11
 #include <asm/hwrpb.h>
13
12
 
..
..
@@ -93,11 +92,6 @@
93
92
 
94
93
 #define page_to_phys(page)	page_to_pa(page)
95
94
 
96
-static inline dma_addr_t __deprecated isa_page_to_bus(struct page *page)
97
-{
98
-	return page_to_phys(page);
99
-}
100
-
101
95
 /* Maximum PIO space address supported?  */
102
96
 #define IO_SPACE_LIMIT 0xffff
103
97
 
..
..
@@ -156,9 +150,9 @@
156
150
 	alpha_mv.mv_##NAME(b, addr);					\
157
151
 }
158
152
 
159
-REMAP1(unsigned int, ioread8, /**/)
160
-REMAP1(unsigned int, ioread16, /**/)
161
-REMAP1(unsigned int, ioread32, /**/)
153
+REMAP1(unsigned int, ioread8, const)
154
+REMAP1(unsigned int, ioread16, const)
155
+REMAP1(unsigned int, ioread32, const)
162
156
 REMAP1(u8, readb, const volatile)
163
157
 REMAP1(u16, readw, const volatile)
164
158
 REMAP1(u32, readl, const volatile)
..
..
@@ -288,20 +282,8 @@
288
282
 	return IO_CONCAT(__IO_PREFIX,ioremap) (port, size);
289
283
 }
290
284
 
291
-static inline void __iomem *__ioremap(unsigned long port, unsigned long size,
292
-				      unsigned long flags)
293
-{
294
-	return ioremap(port, size);
295
-}
296
-
297
-static inline void __iomem * ioremap_nocache(unsigned long offset,
298
-					     unsigned long size)
299
-{
300
-	return ioremap(offset, size);
301
-}
302
-
303
-#define ioremap_wc ioremap_nocache
304
-#define ioremap_uc ioremap_nocache
285
+#define ioremap_wc ioremap
286
+#define ioremap_uc ioremap
305
287
 
306
288
 static inline void iounmap(volatile void __iomem *addr)
307
289
 {
..
..
@@ -325,7 +307,7 @@
325
307
  */
326
308
 
327
309
 #if IO_CONCAT(__IO_PREFIX,trivial_io_bw)
328
-extern inline unsigned int ioread8(void __iomem *addr)
310
+extern inline unsigned int ioread8(const void __iomem *addr)
329
311
 {
330
312
 	unsigned int ret;
331
313
 	mb();
..
..
@@ -334,7 +316,7 @@
334
316
 	return ret;
335
317
 }
336
318
 
337
-extern inline unsigned int ioread16(void __iomem *addr)
319
+extern inline unsigned int ioread16(const void __iomem *addr)
338
320
 {
339
321
 	unsigned int ret;
340
322
 	mb();
..
..
@@ -377,7 +359,7 @@
377
359
 #endif
378
360
 
379
361
 #if IO_CONCAT(__IO_PREFIX,trivial_io_lq)
380
-extern inline unsigned int ioread32(void __iomem *addr)
362
+extern inline unsigned int ioread32(const void __iomem *addr)
381
363
 {
382
364
 	unsigned int ret;
383
365
 	mb();
..
..
@@ -556,8 +538,6 @@
556
538
 #define writew_relaxed	writew
557
539
 #define writel_relaxed	writel
558
540
 #define writeq_relaxed	writeq
559
-
560
-#define mmiowb()
561
541
 
562
542
 /*
563
543
  * String version of IO memory access ops: