aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/coldfire
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@linux-m68k.org>2016-08-23 07:27:16 -0400
committerGreg Ungerer <gerg@linux-m68k.org>2016-09-25 22:02:57 -0400
commit41b39ea19087ca91729972d6497af7fdfaef7449 (patch)
tree4544d039c86b6853febbd7e30c896c5d68501c11 /arch/m68k/coldfire
parentbc065e4784beefdead3e62c31fa5ff7fbb1d7f9e (diff)
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/coldfire')
-rw-r--r--arch/m68k/coldfire/m528x.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/m68k/coldfire/m528x.c b/arch/m68k/coldfire/m528x.c
index 45e947aeade4..12f9e370d8dd 100644
--- a/arch/m68k/coldfire/m528x.c
+++ b/arch/m68k/coldfire/m528x.c
@@ -102,14 +102,14 @@ void wildfiremod_halt(void)
102 printk(KERN_INFO "WildFireMod hibernating...\n"); 102 printk(KERN_INFO "WildFireMod hibernating...\n");
103 103
104 /* Set portE.5 to Digital IO */ 104 /* Set portE.5 to Digital IO */
105 MCF5282_GPIO_PEPAR &= ~(1 << (5 * 2)); 105 writew(readw(MCFGPIO_PEPAR) & ~(1 << (5 * 2)), MCFGPIO_PEPAR);
106 106
107 /* Make portE.5 an output */ 107 /* Make portE.5 an output */
108 MCF5282_GPIO_DDRE |= (1 << 5); 108 writeb(readb(MCFGPIO_PDDR_E) | (1 << 5), MCFGPIO_PDDR_E);
109 109
110 /* Now toggle portE.5 from low to high */ 110 /* Now toggle portE.5 from low to high */
111 MCF5282_GPIO_PORTE &= ~(1 << 5); 111 writeb(readb(MCFGPIO_PODR_E) & ~(1 << 5), MCFGPIO_PODR_E);
112 MCF5282_GPIO_PORTE |= (1 << 5); 112 writeb(readb(MCFGPIO_PODR_E) | (1 << 5), MCFGPIO_PODR_E);
113 113
114 printk(KERN_EMERG "Failed to hibernate. Halting!\n"); 114 printk(KERN_EMERG "Failed to hibernate. Halting!\n");
115} 115}