Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1343f776c51ecbed89eff5e174188523c731a8fe

Authored by Hirokazu Takata
Committed by Linus Torvalds
1 parent c978b0179b
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] m32r: NONCACHE_OFFSET in _port2addr 

Change _port2addr() not to add NONCACHE_OFFSET.  Adding NONCACHE_OFFSET
requires needless address adjusting by a driver using ioremap() like a
SMC91x driver.

Signed-off-by: Hayato Fujiwara <fujiwara@linux-m32r.org>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 5 changed files with 5 additions and 5 deletions Side-by-side Diff

arch/m32r/kernel/io_mappi.c
Diff comments   View file @ 1343f77
... ... @@ -31,7 +31,7 @@
31 31  
32 32 static inline void *_port2addr(unsigned long port)
33 33 {
34   - return (void *)(port + NONCACHE_OFFSET);
  34 + return (void *)(port | (NONCACHE_OFFSET));
35 35 }
36 36  
37 37 static inline void *_port2addr_ne(unsigned long port)
arch/m32r/kernel/io_mappi2.c
Diff comments   View file @ 1343f77
... ... @@ -33,7 +33,7 @@
33 33  
34 34 static inline void *_port2addr(unsigned long port)
35 35 {
36   - return (void *)(port + NONCACHE_OFFSET);
  36 + return (void *)(port | (NONCACHE_OFFSET));
37 37 }
38 38  
39 39 #define LAN_IOSTART 0x300
arch/m32r/kernel/io_oaks32r.c
Diff comments   View file @ 1343f77
... ... @@ -16,7 +16,7 @@
16 16  
17 17 static inline void *_port2addr(unsigned long port)
18 18 {
19   - return (void *)(port + NONCACHE_OFFSET);
  19 + return (void *)(port | (NONCACHE_OFFSET));
20 20 }
21 21  
22 22 static inline void *_port2addr_ne(unsigned long port)
arch/m32r/kernel/io_opsput.c
Diff comments   View file @ 1343f77
... ... @@ -36,7 +36,7 @@
36 36  
37 37 static inline void *_port2addr(unsigned long port)
38 38 {
39   - return (void *)(port + NONCACHE_OFFSET);
  39 + return (void *)(port | (NONCACHE_OFFSET));
40 40 }
41 41  
42 42 /*
arch/m32r/kernel/io_usrv.c
Diff comments   View file @ 1343f77
... ... @@ -47,7 +47,7 @@
47 47 else if (port >= UART1_IOSTART && port <= UART1_IOEND)
48 48 port = ((port - UART1_IOSTART) << 1) + UART1_REGSTART;
49 49 #endif /* CONFIG_SERIAL_8250 || CONFIG_SERIAL_8250_MODULE */
50   - return (void *)(port + NONCACHE_OFFSET);
  50 + return (void *)(port | (NONCACHE_OFFSET));
51 51 }
52 52  
53 53 static inline void delay(void)