diff options
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/include/asm/mcfsmc.h | 6 | ||||
-rw-r--r-- | arch/m68k/include/asm/nettel.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/m68k/include/asm/mcfsmc.h b/arch/m68k/include/asm/mcfsmc.h index 2d7a4dbd9683..527bea5d6788 100644 --- a/arch/m68k/include/asm/mcfsmc.h +++ b/arch/m68k/include/asm/mcfsmc.h | |||
@@ -167,15 +167,15 @@ void smc_remap(unsigned int ioaddr) | |||
167 | static int once = 0; | 167 | static int once = 0; |
168 | extern unsigned short ppdata; | 168 | extern unsigned short ppdata; |
169 | if (once++ == 0) { | 169 | if (once++ == 0) { |
170 | *((volatile unsigned short *)(MCF_MBAR+MCFSIM_PADDR)) = 0x00ec; | 170 | *((volatile unsigned short *)MCFSIM_PADDR) = 0x00ec; |
171 | ppdata |= 0x0080; | 171 | ppdata |= 0x0080; |
172 | *((volatile unsigned short *)(MCF_MBAR+MCFSIM_PADAT)) = ppdata; | 172 | *((volatile unsigned short *)MCFSIM_PADAT) = ppdata; |
173 | outw(0x0001, ioaddr + BANK_SELECT); | 173 | outw(0x0001, ioaddr + BANK_SELECT); |
174 | outw(0x0001, ioaddr + BANK_SELECT); | 174 | outw(0x0001, ioaddr + BANK_SELECT); |
175 | outw(0x0067, ioaddr + BASE); | 175 | outw(0x0067, ioaddr + BASE); |
176 | 176 | ||
177 | ppdata &= ~0x0080; | 177 | ppdata &= ~0x0080; |
178 | *((volatile unsigned short *)(MCF_MBAR+MCFSIM_PADAT)) = ppdata; | 178 | *((volatile unsigned short *)MCFSIM_PADAT) = ppdata; |
179 | } | 179 | } |
180 | 180 | ||
181 | *((volatile unsigned short *)(MCF_MBAR+MCFSIM_CSCR3)) = 0x1180; | 181 | *((volatile unsigned short *)(MCF_MBAR+MCFSIM_CSCR3)) = 0x1180; |
diff --git a/arch/m68k/include/asm/nettel.h b/arch/m68k/include/asm/nettel.h index 0299f6a2deeb..4dec2d9fb994 100644 --- a/arch/m68k/include/asm/nettel.h +++ b/arch/m68k/include/asm/nettel.h | |||
@@ -48,14 +48,14 @@ extern volatile unsigned short ppdata; | |||
48 | static __inline__ unsigned int mcf_getppdata(void) | 48 | static __inline__ unsigned int mcf_getppdata(void) |
49 | { | 49 | { |
50 | volatile unsigned short *pp; | 50 | volatile unsigned short *pp; |
51 | pp = (volatile unsigned short *) (MCF_MBAR + MCFSIM_PADAT); | 51 | pp = (volatile unsigned short *) MCFSIM_PADAT; |
52 | return((unsigned int) *pp); | 52 | return((unsigned int) *pp); |
53 | } | 53 | } |
54 | 54 | ||
55 | static __inline__ void mcf_setppdata(unsigned int mask, unsigned int bits) | 55 | static __inline__ void mcf_setppdata(unsigned int mask, unsigned int bits) |
56 | { | 56 | { |
57 | volatile unsigned short *pp; | 57 | volatile unsigned short *pp; |
58 | pp = (volatile unsigned short *) (MCF_MBAR + MCFSIM_PADAT); | 58 | pp = (volatile unsigned short *) MCFSIM_PADAT; |
59 | ppdata = (ppdata & ~mask) | bits; | 59 | ppdata = (ppdata & ~mask) | bits; |
60 | *pp = ppdata; | 60 | *pp = ppdata; |
61 | } | 61 | } |