Merge tag 'regmap-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[deliverable/linux.git] / arch / arm / boot / dts / kirkwood.dtsi

diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 7eef88f00fea9532d91f81648554f97a9cb5f11d..9809fc1f105ccf683ede2fc11afee659a483a5dc 100644 (file)
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -4,6 +4,18 @@
        compatible = "marvell,kirkwood";
        interrupt-parent = <&intc>;
 
+       cpus {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               cpu@0 {
+                       device_type = "cpu";
+                       compatible = "marvell,feroceon";
+                       clocks = <&core_clk 1>, <&core_clk 3>, <&gate_clk 11>;
+                       clock-names = "cpu_clk", "ddrclk", "powersave";
+               };
+       };
+
        aliases {
               gpio0 = &gpio0;
               gpio1 = &gpio1;
@@ -18,8 +30,9 @@
 
        ocp@f1000000 {
                compatible = "simple-bus";
-               ranges = <0x00000000 0xf1000000 0x4000000
+               ranges = <0x00000000 0xf1000000 0x0100000
                          0xe0000000 0xe0000000 0x8100000 /* PCIE */
+                         0xf4000000 0xf4000000 0x0000400
                          0xf5000000 0xf5000000 0x0000400>;
                #address-cells = <1>;
                #size-cells = <1>;
@@ -72,13 +85,6 @@
                        status = "disabled";
                };
 
-               rtc@10300 {
-                       compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
-                       reg = <0x10300 0x20>;
-                       interrupts = <53>;
-                       clocks = <&gate_clk 7>;
-               };
-
                spi@10600 {
                        compatible = "marvell,orion-spi";
                        #address-cells = <1>;
@@ -152,15 +158,6 @@
                        status = "okay";
                };
 
-               sata@80000 {
-                       compatible = "marvell,orion-sata";
-                       reg = <0x80000 0x5000>;
-                       interrupts = <21>;
-                       clocks = <&gate_clk 14>, <&gate_clk 15>;
-                       clock-names = "0", "1";
-                       status = "disabled";
-               };
-
                nand@3000000 {
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -168,7 +165,7 @@
                        ale = <1>;
                        bank-width = <1>;
                        compatible = "marvell,orion-nand";
-                       reg = <0x3000000 0x400>;
+                       reg = <0xf4000000 0x400>;
                        chip-delay = <25>;
                        /* set partition map and/or chip-delay in board dts */
                        clocks = <&gate_clk 7>;
@@ -195,13 +192,5 @@
                        clocks = <&gate_clk 17>;
                        status = "okay";
                };
-
-               mvsdio@90000 {
-                       compatible = "marvell,orion-sdio";
-                       reg = <0x90000 0x200>;
-                       interrupts = <28>;
-                       clocks = <&gate_clk 4>;
-                       status = "disabled";
-               };
        };
 };