Skip to contentSkip to conversation

m68k: coldfire: fix breakage of missed IO access updates

PATCH In review Greg Ungerer 2 participants 2 messages Jul 7

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 m68k: coldfire: fix breakage of missed IO access updates

From: Greg Ungerer <[email protected]>

Commit e1f3a00670d1 ("m68k: coldfire: use ColdFire specifc IO access in SoC code") incorrectly updated a couple of local IO access uses. They use "read8" when they should be using the new "mcf_read8". Fix them.

This causes compile time breakage for two specific SoC types, the ColdFire 5235 and 5282. They got missed in original testing due to not having any defconfigs for these specific parts.

Fixes e1f3a00670d1 ("m68k: coldfire: use ColdFire specifc IO access in SoC code")
---
 arch/m68k/coldfire/m523x.c | 2 +-
 arch/m68k/coldfire/m528x.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
arch/m68k/coldfire/m523x.c +1 -1
index 11d7423ef646..ec04c32bb03c 100644
@@ -79,7 +79,7 @@ static void __init m523x_i2c_init(void)
 static void __init m523x_fec_init(void)
 {
 	/* Set multi-function pins to ethernet use */
-	mcf_write8(read8(MCFGPIO_PAR_FECI2C) | 0xf0, MCFGPIO_PAR_FECI2C);
+	mcf_write8(mcf_read8(MCFGPIO_PAR_FECI2C) | 0xf0, MCFGPIO_PAR_FECI2C);
 }
 
 /***************************************************************************/
arch/m68k/coldfire/m528x.c +3 -3
index b244c9ba40a7..3383b1ba106a 100644
@@ -113,11 +113,11 @@ void wildfiremod_halt(void)
 	mcf_write16(read16(MCFGPIO_PEPAR) & ~(1 << (5 * 2)), MCFGPIO_PEPAR);
 
 	/* Make portE.5 an output */
-	mcf_write8(read8(MCFGPIO_PDDR_E) | (1 << 5), MCFGPIO_PDDR_E);
+	mcf_write8(mcf_read8(MCFGPIO_PDDR_E) | (1 << 5), MCFGPIO_PDDR_E);
 
 	/* Now toggle portE.5 from low to high */
-	mcf_write8(read8(MCFGPIO_PODR_E) & ~(1 << 5), MCFGPIO_PODR_E);
-	mcf_write8(read8(MCFGPIO_PODR_E) | (1 << 5), MCFGPIO_PODR_E);
+	mcf_write8(mcf_read8(MCFGPIO_PODR_E) & ~(1 << 5), MCFGPIO_PODR_E);
+	mcf_write8(mcf_read8(MCFGPIO_PODR_E) | (1 << 5), MCFGPIO_PODR_E);
 
 	printk(KERN_EMERG "Failed to hibernate. Halting!\n");
 }
Signature · 1 line
2.54.0
Acked-by on v1 1/1
#1 lore raw
Quoted 10 lines · Greg Ungerer

From: Greg Ungerer <[email protected]>

Commit e1f3a00670d1 ("m68k: coldfire: use ColdFire specifc IO access in SoC code") incorrectly updated a couple of local IO access uses. They use "read8" when they should be using the new "mcf_read8". Fix them.

This causes compile time breakage for two specific SoC types, the ColdFire 5235 and 5282. They got missed in original testing due to not having any defconfigs for these specific parts.

Quoted 6 lines
Fixes e1f3a00670d1 ("m68k: coldfire: use ColdFire specifc IO access in

SoC code")

Closes:
https://lore.kernel.org/oe-kbuild-all/[email protected]/