diff options
author | Adam Baker <linux@baker-net.org.uk> | 2014-04-06 22:42:47 +0100 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2014-04-24 04:41:10 +0000 |
commit | 655220960f2256df5b86c21224518d05e6cc4f84 (patch) | |
tree | dbc1cee747a965d167530fa81ef84983900fa68c /arch/arm/boot/dts/kirkwood-nsa310.dts | |
parent | c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 (diff) |
ARM: kirkwood: Move NSA310 common parts to include file
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>
Diffstat (limited to 'arch/arm/boot/dts/kirkwood-nsa310.dts')
-rw-r--r-- | arch/arm/boot/dts/kirkwood-nsa310.dts | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts index 03fa24cf3344..372f701d5338 100644 --- a/arch/arm/boot/dts/kirkwood-nsa310.dts +++ b/arch/arm/boot/dts/kirkwood-nsa310.dts @@ -59,26 +59,6 @@ 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"; @@ -94,10 +74,6 @@ marvell,function = "gpio"; }; - pmx_btn_power: pmx-btn-power { - marvell,pins = "mpp46"; - marvell,function = "gpio"; - }; }; i2c@11000 { @@ -110,30 +86,6 @@ }; }; - 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 |