generic GPIO support misc files.

The definition of MCFSIM_PADDR and MCFSIM_PADAT now has MCF_BAR already added in.

Signed-off-by: Steven King <sfking@fdwdc.com>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>

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)
         static int              once = 0;
         extern unsigned short   ppdata;
         if (once++ == 0) {
-                *((volatile unsigned short *)(MCF_MBAR+MCFSIM_PADDR)) = 0x00ec;
+                *((volatile unsigned short *)MCFSIM_PADDR) = 0x00ec;
                 ppdata |= 0x0080;
-                *((volatile unsigned short *)(MCF_MBAR+MCFSIM_PADAT)) = ppdata;
+                *((volatile unsigned short *)MCFSIM_PADAT) = ppdata;
                 outw(0x0001, ioaddr + BANK_SELECT);
                 outw(0x0001, ioaddr + BANK_SELECT);
                 outw(0x0067, ioaddr + BASE);
 
                 ppdata &= ~0x0080;
-                *((volatile unsigned short *)(MCF_MBAR+MCFSIM_PADAT)) = ppdata;
+                *((volatile unsigned short *)MCFSIM_PADAT) = ppdata;
         }
         
         *((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;
 static __inline__ unsigned int mcf_getppdata(void)
 {
         volatile unsigned short *pp;
-        pp = (volatile unsigned short *) (MCF_MBAR + MCFSIM_PADAT);
+        pp = (volatile unsigned short *) MCFSIM_PADAT;
         return((unsigned int) *pp);
 }
 
 static __inline__ void mcf_setppdata(unsigned int mask, unsigned int bits)
 {
         volatile unsigned short *pp;
-        pp = (volatile unsigned short *) (MCF_MBAR + MCFSIM_PADAT);
+        pp = (volatile unsigned short *) MCFSIM_PADAT;
         ppdata = (ppdata & ~mask) | bits;
         *pp = ppdata;
 }