Merge tag 'v3.15-rc1' into perf/urgent

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

diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 85542c2f34b145c3be24ee99abadc2c905ab1925..90384587c27843c563d2c4328ce9411f4c26458b 100644 (file)
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -24,6 +24,7 @@
        aliases {
               gpio0 = &gpio0;
               gpio1 = &gpio1;
+              i2c0 = &i2c0;
        };
 
        mbus {
@@ -111,7 +112,7 @@
                        clocks = <&gate_clk 7>;
                };
 
-               i2c@11000 {
+               i2c0: i2c@11000 {
                        compatible = "marvell,mv64xxx-i2c";
                        reg = <0x11000 0x20>;
                        #address-cells = <1>;
@@ -145,6 +146,11 @@
                        reg = <0x20000 0x80>, <0x1500 0x20>;
                };
 
+               system-controller@20000 {
+                       compatible = "marvell,orion-system-controller";
+                       reg = <0x20000 0x120>;
+               };
+
                bridge_intc: bridge-interrupt-ctrl@20110 {
                        compatible = "marvell,orion-bridge-intc";
                        interrupt-controller;
@@ -161,6 +167,11 @@
                        #clock-cells = <1>;
                };
 
+               l2: l2-cache@20128 {
+                       compatible = "marvell,kirkwood-cache";
+                       reg = <0x20128 0x4>;
+               };
+
                intc: main-interrupt-ctrl@20200 {
                        compatible = "marvell,orion-intc";
                        interrupt-controller;
@@ -300,5 +311,14 @@
                        #phy-cells = <0>;
                        status = "ok";
                };
+
+               audio0: audio-controller@a0000 {
+                       compatible = "marvell,kirkwood-audio";
+                       reg = <0xa0000 0x2210>;
+                       interrupts = <24>;
+                       clocks = <&gate_clk 9>;
+                       clock-names = "internal";
+                       status = "disabled";
+               };
        };
 };