diff options
| author | Greg Ungerer <gerg@linux-m68k.org> | 2016-08-23 21:27:16 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@linux-m68k.org> | 2016-09-26 12:02:57 +1000 |
| commit | 41b39ea19087ca91729972d6497af7fdfaef7449 (patch) | |
| tree | 4544d039c86b6853febbd7e30c896c5d68501c11 /arch/m68k | |
| parent | bc065e4784beefdead3e62c31fa5ff7fbb1d7f9e (diff) | |
| download | op-kernel-dev-41b39ea19087ca91729972d6497af7fdfaef7449.zip op-kernel-dev-41b39ea19087ca91729972d6497af7fdfaef7449.tar.gz | |
m68knommu: switch to using IO access methods in WildFire board code
Most ColdFire support code has switched to using IO memory access
methods (readb/writeb/etc) when reading and writing internal peripheral
device registers. The WildFire board specific halt code was missed.
As it is now the WildFire code is broken, since all register definitions
were changed to be register addresses only some time ago.
Fix the WildFire board code to use the appropriate IO access functions.
Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/coldfire/m528x.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/m68k/coldfire/m528x.c b/arch/m68k/coldfire/m528x.c index 45e947a..12f9e37 100644 --- a/arch/m68k/coldfire/m528x.c +++ b/arch/m68k/coldfire/m528x.c @@ -102,14 +102,14 @@ void wildfiremod_halt(void) printk(KERN_INFO "WildFireMod hibernating...\n"); /* Set portE.5 to Digital IO */ - MCF5282_GPIO_PEPAR &= ~(1 << (5 * 2)); + writew(readw(MCFGPIO_PEPAR) & ~(1 << (5 * 2)), MCFGPIO_PEPAR); /* Make portE.5 an output */ - MCF5282_GPIO_DDRE |= (1 << 5); + writeb(readb(MCFGPIO_PDDR_E) | (1 << 5), MCFGPIO_PDDR_E); /* Now toggle portE.5 from low to high */ - MCF5282_GPIO_PORTE &= ~(1 << 5); - MCF5282_GPIO_PORTE |= (1 << 5); + writeb(readb(MCFGPIO_PODR_E) & ~(1 << 5), MCFGPIO_PODR_E); + writeb(readb(MCFGPIO_PODR_E) | (1 << 5), MCFGPIO_PODR_E); printk(KERN_EMERG "Failed to hibernate. Halting!\n"); } |
