diff options
author | sfking@fdwdc.com <sfking@fdwdc.com> | 2009-06-19 21:11:12 -0400 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2009-09-09 22:01:24 -0400 |
commit | 732c611e5bbb76201397297f834dddd5ab684b05 (patch) | |
tree | 395c1a7f4733961544b608ca60cda7a50f7bdbfa /arch/m68k/include/asm/nettel.h | |
parent | dca7cf33bb5c98187ffcc849652b1b2c4c8a0c25 (diff) |
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>
Diffstat (limited to 'arch/m68k/include/asm/nettel.h')
-rw-r--r-- | arch/m68k/include/asm/nettel.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 | } |