diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-12-16 06:38:58 +0300 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-12-16 06:38:58 +0300 |
| commit | 1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a (patch) | |
| tree | 0cf88547108a750d6eb910564ef5bf0ffb5ceef3 /arch/powerpc/boot/dts | |
| parent | 91cac623262c1c0cd298c5c648a8bd2b647c264d (diff) | |
| parent | 23e0e8afafd9ac065d81506524adf3339584044b (diff) | |
| download | linux-1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a.tar.xz | |
Merge branch 'merge' into next
Diffstat (limited to 'arch/powerpc/boot/dts')
| -rw-r--r-- | arch/powerpc/boot/dts/mpc8349emitx.dts | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts index d86c6a3283ec..5ba5c6633b81 100644 --- a/arch/powerpc/boot/dts/mpc8349emitx.dts +++ b/arch/powerpc/boot/dts/mpc8349emitx.dts @@ -90,6 +90,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 { @@ -138,14 +146,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 { |