Merge remote-tracking branch 'kumar/next' into next

Freescale updates for 3.6

1 files changed, 23 insertions, 0 deletions

diff --git a/arch/powerpc/boot/dts/mgcoge.dts b/arch/powerpc/boot/dts/mgcoge.dts
index ededaf5ac015..d72fb5e219d0 100644
--- a/arch/powerpc/boot/dts/mgcoge.dts
+++ b/arch/powerpc/boot/dts/mgcoge.dts
@@ -222,6 +222,29 @@
                                 interrupt-parent = <&PIC>;
                                 usb-clock = <5>;
                         };
+                        spi@11aa0 {
+                                cell-index = <0>;
+                                compatible = "fsl,spi", "fsl,cpm2-spi";
+                                reg = <0x11a80 0x40 0x89fc 0x2>;
+                                interrupts = <2 8>;
+                                interrupt-parent = <&PIC>;
+                                gpios = < &cpm2_pio_d 19 0>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                ds3106@1 {
+                                        compatible = "gen,spidev";
+                                        reg = <0>;
+                                        spi-max-frequency = <8000000>;
+                                };
+                        };
+
+                };
+
+                cpm2_pio_d: gpio-controller@10d60 {
+                        #gpio-cells = <2>;
+                        compatible = "fsl,cpm2-pario-bank";
+                        reg = <0x10d60 0x14>;
+                        gpio-controller;
                 };
 
                 cpm2_pio_c: gpio-controller@10d40 {