Merge commit '4cb38750d49010ae72e718d46605ac9ba5a851b4' into stable/for-linus-3.6

* commit '4cb38750d49010ae72e718d46605ac9ba5a851b4': (6849 commits)
  bcma: fix invalid PMU chip control masks
  [libata] pata_cmd64x: whitespace cleanup
  libata-acpi: fix up for acpi_pm_device_sleep_state API
  sata_dwc_460ex: device tree may specify dma_channel
  ahci, trivial: fixed coding style issues related to braces
  ahci_platform: add hibernation callbacks
  libata-eh.c: local functions should not be exposed globally
  libata-transport.c: local functions should not be exposed globally
  sata_dwc_460ex: support hardreset
  ata: use module_pci_driver
  drivers/ata/pata_pcmcia.c: adjust suspicious bit operation
  pata_imx: Convert to clk_prepare_enable/clk_disable_unprepare
  ahci: Enable SB600 64bit DMA on MSI K9AGM2 (MS-7327) v2
  [libata] Prevent interface errors with Seagate FreeAgent GoFlex
  drivers/acpi/glue: revert accidental license-related 6b66d95895c bits
  libata-acpi: add missing inlines in libata.h
  i2c-omap: Add support for I2C_M_STOP message flag
  i2c: Fall back to emulated SMBus if the operation isn't supported natively
  i2c: Add SCCB support
  i2c-tiny-usb: Add support for the Robofuzz OSIF USB/I2C converter
  ...

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 {