| Message ID | 20081127173645.GA28796@oksana.dev.rtsoft.ru (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Commit | dafdb61313e80e20cfeef7bf4653dcb47cf28591 |
| Delegated to: | Kumar Gala |
| Headers | show |
On Nov 27, 2008, at 11:36 AM, Anton Vorontsov wrote: > 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 <avorontsov@ru.mvista.com> > --- > arch/powerpc/boot/dts/mpc8349emitx.dts | 16 ++++++++-------- > 1 files changed, 8 insertions(+), 8 deletions(-) applied to merge - k
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts index 2c9d54a..4bdbaf4 100644 --- a/arch/powerpc/boot/dts/mpc8349emitx.dts +++ b/arch/powerpc/boot/dts/mpc8349emitx.dts @@ -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 {
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 <avorontsov@ru.mvista.com> --- arch/powerpc/boot/dts/mpc8349emitx.dts | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)