Merge remote branch 'jwb/next' into next

1 files changed, 24 insertions, 0 deletions

diff --git a/arch/powerpc/boot/dts/canyonlands.dts b/arch/powerpc/boot/dts/canyonlands.dts
index 5b27a4b74b79..2779f08313a5 100644
--- a/arch/powerpc/boot/dts/canyonlands.dts
+++ b/arch/powerpc/boot/dts/canyonlands.dts
@@ -172,6 +172,19 @@
                         interrupts = <0x1e 4>;
                 };
 
+                USBOTG0: usbotg@bff80000 {
+                        compatible = "amcc,dwc-otg";
+                        reg = <0x4 0xbff80000 0x10000>;
+                        interrupt-parent = <&USBOTG0>;
+                        #interrupt-cells = <1>;
+                        #address-cells = <0>;
+                        #size-cells = <0>;
+                        interrupts = <0x0 0x1 0x2>;
+                        interrupt-map = </* USB-OTG */ 0x0 &UIC2 0x1c 0x4
+                                         /* HIGH-POWER */ 0x1 &UIC1 0x1a 0x8
+                                         /* DMA */ 0x2 &UIC0 0xc 0x4>;
+                };
+
                 SATA0: sata@bffd1000 {
                         compatible = "amcc,sata-460ex";
                         reg = <4 0xbffd1000 0x800 4 0xbffd0800 0x400>;
@@ -233,6 +246,11 @@
                                         };
                                 };
 
+                                cpld@2,0 {
+                                        compatible = "amcc,ppc460ex-bcsr";
+                                        reg = <2 0x0 0x9>;
+                                };
+
                                 ndfc@3,0 {
                                         compatible = "ibm,ndfc";
                                         reg = <0x00000003 0x00000000 0x00002000>;
@@ -307,6 +325,12 @@
                                 interrupts = <0x3 0x4>;
                         };
 
+                        GPIO0: gpio@ef600b00 {
+                                compatible = "ibm,ppc4xx-gpio";
+                                reg = <0xef600b00 0x00000048>;
+                                gpio-controller;
+                        };
+
                         ZMII0: emac-zmii@ef600d00 {
                                 compatible = "ibm,zmii-460ex", "ibm,zmii";
                                 reg = <0xef600d00 0x0000000c>;