Skip to contentSkip to conversation

powerpc/83xx: Fix MCU support merge issue in mpc8349emitx.dts

PATCH Applied Anton Vorontsov 2 participants 2 messages Nov 27, 2008 – Dec 3, 2008

Subsystems (2)
Device tree bindings PowerPC
lore
Share & tools
lore

Anton Vorontsov

author
#0 lore raw

PATCH 1/1 powerpc/83xx: Fix MCU support merge issue in mpc8349emitx.dts

Just found the merge issue in 442746989d92afc125040e0f29b33602ad94da99 ("powerpc/83xx: Add support for MCU microcontroller in .dts files"):
the commit adds the MCU controller node into the DMA node, which is wrong because the MCU sits on the I2C bus. Fix this by moving the MCU node into the I2C controller node.

The original patch[1] was OK though. ;-)

[1] http://patchwork.ozlabs.org/patch/4895/

Signed-off-by Anton Vorontsov <[email protected]>
---
 arch/powerpc/boot/dts/mpc8349emitx.dts |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
arch/powerpc/boot/dts/mpc8349emitx.dts +8 -8
index 2c9d54a..4bdbaf4 100644
@@ -91,6 +91,14 @@
 				interrupts = <18 0x8>;
 				interrupt-parent = <&ipic>;
 			};
+
+			mcu_pio: mcu@a {
+				#gpio-cells = <2>;
+				compatible = "fsl,mc9s08qg8-mpc8349emitx",
+					     "fsl,mcu-mpc8349emitx";
+				reg = <0x0a>;
+				gpio-controller;
+			};
 		};
 
 		spi@7000 {

@@ -139,14 +147,6 @@
 				interrupt-parent = <&ipic>;
 				interrupts = <71 8>;
 			};
-
-			mcu_pio: mcu@a {
-				#gpio-cells = <2>;
-				compatible = "fsl,mc9s08qg8-mpc8349emitx",
-					     "fsl,mcu-mpc8349emitx";
-				reg = <0x0a>;
-				gpio-controller;
-			};
 		};
 
 		usb@22000 {
Signature · 1 line
1.5.6.5
Applied
#1 lore raw
Quoted 6 lines · Anton Vorontsov

Just found the merge issue in 442746989d92afc125040e0f29b33602ad94da99 ("powerpc/83xx: Add support for MCU microcontroller in .dts files"):
the commit adds the MCU controller node into the DMA node, which is wrong because the MCU sits on the I2C bus. Fix this by moving the MCU node into the I2C controller node.

Quoted 8 lines

The original patch[1] was OK though. ;-)

[1] http://patchwork.ozlabs.org/patch/4895/

Signed-off-by Anton Vorontsov <[email protected]>

---
arch/powerpc/boot/dts/mpc8349emitx.dts | 16 ++++++++--------

1 files changed, 8 insertions(+), 8 deletions(-)

applied to merge

- k