Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / aspeed-g5.dtsi

diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index 17f2714d18a7ec09e4722d557831379e38157b89..87fdc146ff525af94c8db648f8f46b8c3c1084d4 100644 (file)
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -127,6 +127,13 @@
                        reg = <0x1e6c0080 0x80>;
                };
 
+               cvic: copro-interrupt-controller@1e6c2000 {
+                       compatible = "aspeed,ast2500-cvic", "aspeed-cvic";
+                       valid-sources = <0xffffffff>;
+                       copro-sw-interrupts = <1>;
+                       reg = <0x1e6c2000 0x80>;
+               };
+
                mac0: ethernet@1e660000 {
                        compatible = "aspeed,ast2500-mac", "faraday,ftgmac100";
                        reg = <0x1e660000 0x180>;
@@ -148,6 +155,8 @@
                        reg = <0x1e6a1000 0x100>;
                        interrupts = <5>;
                        clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_usb2ah_default>;
                        status = "disabled";
                };
 
@@ -156,6 +165,8 @@
                        reg = <0x1e6a3000 0x100>;
                        interrupts = <13>;
                        clocks = <&syscon ASPEED_CLK_GATE_USBPORT2CLK>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_usb2bh_default>;
                        status = "disabled";
                };
 
@@ -166,6 +177,20 @@
                        #ports = <2>;
                        clocks = <&syscon ASPEED_CLK_GATE_USBUHCICLK>;
                        status = "disabled";
+                       /*
+                        * No default pinmux, it will follow EHCI, use an explicit pinmux
+                        * override if you don't enable EHCI
+                        */
+               };
+
+               vhub: usb-vhub@1e6a0000 {
+                       compatible = "aspeed,ast2500-usb-vhub";
+                       reg = <0x1e6a0000 0x300>;
+                       interrupts = <5>;
+                       clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_usb2ad_default>;
+                       status = "disabled";
                };
 
                apb {
@@ -211,7 +236,7 @@
                                status = "disabled";
                        };
 
-                       sram@1e720000 {
+                       sram: sram@1e720000 {
                                compatible = "mmio-sram";
                                reg = <0x1e720000 0x9000>;      // 36K
                        };
@@ -281,7 +306,7 @@
                                #address-cells = <1>;
                                #size-cells = <0>;
                                reg = <0x1e786000 0x1000>;
-                               clocks = <&syscon ASPEED_CLK_APB>;
+                               clocks = <&syscon ASPEED_CLK_24M>;
                                resets = <&syscon ASPEED_RESET_PWM>;
                                status = "disabled";
                        };
@@ -1417,6 +1442,11 @@
                groups = "USB2AH";
        };
 
+       pinctrl_usb2ad_default: usb2ad_default {
+               function = "USB2AD";
+               groups = "USB2AD";
+       };
+
        pinctrl_usb11bhid_default: usb11bhid_default {
                function = "USB11BHID";
                groups = "USB11BHID";