Merge tag 'dt-3.12' of git://git.infradead.org/linux-mvebu into next/soc

[karo-tx-linux.git] / arch / arm / boot / dts / kirkwood-nsa310.dts

diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts
index 69003598f5faa8287d593a03b9a5371e9254e4bb..7aeae0c2c1f498bd31fd6572b278dbe944eab107 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-nsa310.dts
+++ b/arch/arm/boot/dts/kirkwood-nsa310.dts
@@ -1,10 +1,8 @@
 /dts-v1/;
 
-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood-nsa310-common.dtsi"
 
 / {
-       model = "ZyXEL NSA310";
        compatible = "zyxel,nsa310", "marvell,kirkwood-88f6281", "marvell,kirkwood";
 
        memory {
@@ -16,6 +14,17 @@
                bootargs = "console=ttyS0,115200";
        };
 
+       mbus {
+               ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>;
+               pcie-controller {
+                       status = "okay";
+
+                       pcie@1,0 {
+                               status = "okay";
+                       };
+               };
+       };
+
        ocp@f1000000 {
                pinctrl: pinctrl@10000 {
                        pinctrl-0 = <&pmx_unknown>;
@@ -41,11 +50,6 @@
                                marvell,function = "gpio";
                        };
 
-                       pmx_usb_power_off: pmx-usb-power-off {
-                               marvell,pins = "mpp21";
-                               marvell,function = "gpio";
-                       };
-
                        pmx_led_sys_green: pmx-led-sys-green {
                                marvell,pins = "mpp28";
                                marvell,function = "gpio";
@@ -95,20 +99,6 @@
                                marvell,pins = "mpp46";
                                marvell,function = "gpio";
                        };
-
-                       pmx_pwr_off: pmx-pwr-off {
-                               marvell,pins = "mpp48";
-                               marvell,function = "gpio";
-                       };
-               };
-
-               serial@12000 {
-                       status = "ok";
-               };
-
-               sata@80000 {
-                       status = "okay";
-                       nr-ports = <2>;
                };
 
                i2c@11000 {
@@ -119,57 +109,6 @@
                                reg = <0x2e>;
                        };
                };
-
-               nand@3000000 {
-                       status = "okay";
-                       chip-delay = <35>;
-
-                       partition@0 {
-                               label = "uboot";
-                               reg = <0x0000000 0x0100000>;
-                               read-only;
-                       };
-                       partition@100000 {
-                               label = "uboot_env";
-                               reg = <0x0100000 0x0080000>;
-                       };
-                       partition@180000 {
-                               label = "key_store";
-                               reg = <0x0180000 0x0080000>;
-                       };
-                       partition@200000 {
-                               label = "info";
-                               reg = <0x0200000 0x0080000>;
-                       };
-                       partition@280000 {
-                               label = "etc";
-                               reg = <0x0280000 0x0a00000>;
-                       };
-                       partition@c80000 {
-                               label = "kernel_1";
-                               reg = <0x0c80000 0x0a00000>;
-                       };
-                       partition@1680000 {
-                               label = "rootfs1";
-                               reg = <0x1680000 0x2fc0000>;
-                       };
-                       partition@4640000 {
-                               label = "kernel_2";
-                               reg = <0x4640000 0x0a00000>;
-                       };
-                       partition@5040000 {
-                               label = "rootfs2";
-                               reg = <0x5040000 0x2fc0000>;
-                       };
-               };
-
-               pcie-controller {
-                       status = "okay";
-
-                       pcie@1,0 {
-                               status = "okay";
-                       };
-               };
        };
 
        gpio_keys {
@@ -246,30 +185,4 @@
                        gpios = <&gpio1 8 0>;
                };
        };
-
-       gpio_poweroff {
-               compatible = "gpio-poweroff";
-               pinctrl-0 = <&pmx_pwr_off>;
-               pinctrl-names = "default";
-               gpios = <&gpio1 16 0>;
-       };
-
-       regulators {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               pinctrl-0 = <&pmx_usb_power_off>;
-               pinctrl-names = "default";
-
-               usb0_power_off: regulator@1 {
-                       compatible = "regulator-fixed";
-                       reg = <1>;
-                       regulator-name = "USB Power Off";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       gpio = <&gpio0 21 0>;
-               };
-       };
 };