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 02e70ad3ab70dfef3ffc52ae2d4c1d1731866659..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>;
@@ -229,7 +236,7 @@
                                status = "disabled";
                        };
 
-                       sram@1e720000 {
+                       sram: sram@1e720000 {
                                compatible = "mmio-sram";
                                reg = <0x1e720000 0x9000>;      // 36K
                        };