ARM: kirkwood: Move NSA310 common parts to include file
authorAdam Baker <linux@baker-net.org.uk>
Sun, 6 Apr 2014 21:42:47 +0000 (22:42 +0100)
committerJason Cooper <jason@lakedaemon.net>
Thu, 24 Apr 2014 04:41:10 +0000 (04:41 +0000)
 Move definitions that are common to both nsa-310.dts and
 nsa310a.dts and that will also be used in nsa320 into
 kirkwood-nsa310-common.dtsi. Also rename the USB
 Regulator to remove the word off from its name as the
 state of a regulator shouldn't be part of its name.

Signed-off-by: Adam Baker <linux@baker-net.org.uk>
Link: https://lkml.kernel.org/r/1396820569-3841-1-git-send-email-linux@baker-net.org.uk
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
arch/arm/boot/dts/kirkwood-nsa310-common.dtsi
arch/arm/boot/dts/kirkwood-nsa310.dts
arch/arm/boot/dts/kirkwood-nsa310a.dts

index aa78c2d11fe738fc843f716bd1a6f98ff1054a5b..843b8b561e5eb25810b0a4519c693fa3178f63fd 100644 (file)
@@ -7,15 +7,40 @@
        ocp@f1000000 {
                pinctrl: pinctrl@10000 {
 
-                       pmx_usb_power_off: pmx-usb-power-off {
+                       pmx_usb_power: pmx-usb-power {
                                marvell,pins = "mpp21";
                                marvell,function = "gpio";
                        };
+
                        pmx_pwr_off: pmx-pwr-off {
                                marvell,pins = "mpp48";
                                marvell,function = "gpio";
                        };
 
+                       pmx_btn_reset: pmx-btn-reset {
+                               marvell,pins = "mpp36";
+                               marvell,function = "gpio";
+                       };
+
+                       pmx_btn_copy: pmx-btn-copy {
+                               marvell,pins = "mpp37";
+                               marvell,function = "gpio";
+                       };
+
+                       pmx_btn_power: pmx-btn-power {
+                               marvell,pins = "mpp46";
+                               marvell,function = "gpio";
+                       };
+
+                       pmx_led_copy_green: pmx-led-copy-green {
+                               marvell,pins = "mpp39";
+                               marvell,function = "gpio";
+                       };
+
+                       pmx_led_copy_red: pmx-led-copy-red {
+                               marvell,pins = "mpp40";
+                               marvell,function = "gpio";
+                       };
                };
 
                serial@12000 {
                gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>;
        };
 
+       gpio_keys {
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy &pmx_btn_power>;
+               pinctrl-names = "default";
+
+               button@1 {
+                       label = "Power Button";
+                       linux,code = <KEY_POWER>;
+                       gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
+               };
+               button@2 {
+                       label = "Copy Button";
+                       linux,code = <KEY_COPY>;
+                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+               };
+               button@3 {
+                       label = "Reset Button";
+                       linux,code = <KEY_RESTART>;
+                       gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
+               };
+       };
+
+
        regulators {
                compatible = "simple-bus";
                #address-cells = <1>;
                #size-cells = <0>;
-               pinctrl-0 = <&pmx_usb_power_off>;
+               pinctrl-0 = <&pmx_usb_power>;
                pinctrl-names = "default";
 
-               usb0_power_off: regulator@1 {
+               usb0_power: regulator@1 {
                        compatible = "regulator-fixed";
                        reg = <1>;
-                       regulator-name = "USB Power Off";
+                       regulator-name = "USB Power";
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;
                        regulator-always-on;
index 03fa24cf334468ff66095883b64ac5b76ae6bc42..372f701d533809681d50289837a2ae9c84a127d8 100644 (file)
                                marvell,function = "gpio";
                        };
 
-                       pmx_btn_reset: pmx-btn-reset {
-                               marvell,pins = "mpp36";
-                               marvell,function = "gpio";
-                       };
-
-                       pmx_btn_copy: pmx-btn-copy {
-                               marvell,pins = "mpp37";
-                               marvell,function = "gpio";
-                       };
-
-                       pmx_led_copy_green: pmx-led-copy-green {
-                               marvell,pins = "mpp39";
-                               marvell,function = "gpio";
-                       };
-
-                       pmx_led_copy_red: pmx-led-copy-red {
-                               marvell,pins = "mpp40";
-                               marvell,function = "gpio";
-                       };
-
                        pmx_led_hdd_green: pmx-led-hdd-green {
                                marvell,pins = "mpp41";
                                marvell,function = "gpio";
                                marvell,function = "gpio";
                        };
 
-                       pmx_btn_power: pmx-btn-power {
-                               marvell,pins = "mpp46";
-                               marvell,function = "gpio";
-                       };
                };
 
                i2c@11000 {
                };
        };
 
-       gpio_keys {
-               compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy &pmx_btn_power>;
-               pinctrl-names = "default";
-
-               button@1 {
-                       label = "Power Button";
-                       linux,code = <KEY_POWER>;
-                       gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
-               };
-               button@2 {
-                       label = "Copy Button";
-                       linux,code = <KEY_COPY>;
-                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
-               };
-               button@3 {
-                       label = "Reset Button";
-                       linux,code = <KEY_RESTART>;
-                       gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
-               };
-       };
-
        gpio-leds {
                compatible = "gpio-leds";
                pinctrl-0 = <&pmx_led_esata_green &pmx_led_esata_red
index a5e77945286776940aa38d363ad08bc081e85e3b..ead7a36d1089fa3d5989cd8c1cc681f22a611a0f 100644 (file)
                                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";
                                marvell,function = "gpio";
                        };
 
-                       pmx_btn_reset: pmx-btn-reset {
-                               marvell,pins = "mpp36";
-                               marvell,function = "gpio";
-                       };
-
-                       pmx_btn_copy: pmx-btn-copy {
-                               marvell,pins = "mpp37";
-                               marvell,function = "gpio";
-                       };
-
-                       pmx_led_copy_green: pmx-led-copy-green {
-                               marvell,pins = "mpp39";
-                               marvell,function = "gpio";
-                       };
-
-                       pmx_led_copy_red: pmx-led-copy-red {
-                               marvell,pins = "mpp40";
-                               marvell,function = "gpio";
-                       };
-
                        pmx_led_hdd_green: pmx-led-hdd-green {
                                marvell,pins = "mpp41";
                                marvell,function = "gpio";
                                marvell,function = "gpio";
                        };
 
-                       pmx_btn_power: pmx-btn-power {
-                               marvell,pins = "mpp46";
-                               marvell,function = "gpio";
-                       };
-
                };
 
                i2c@11000 {
                };
        };
 
-       gpio_keys {
-               compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               button@1 {
-                       label = "Power Button";
-                       linux,code = <KEY_POWER>;
-                       gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
-               };
-               button@2 {
-                       label = "Copy Button";
-                       linux,code = <KEY_COPY>;
-                       gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
-               };
-               button@3 {
-                       label = "Reset Button";
-                       linux,code = <KEY_RESTART>;
-                       gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
-               };
-       };
-
        gpio-leds {
                compatible = "gpio-leds";