diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2016-11-29 10:13:39 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2017-02-20 10:56:00 +0000 |
| commit | 0bf7fc77d582911671d1e9615e3e530780a22e09 (patch) | |
| tree | 220a2f4a77471f354d8cda0a163a662779c80ff1 | |
| parent | 7ad026b32bf9dc22ee87172a0777d66604a1b217 (diff) | |
ARM: dts: armada388-clearfog: move rear button
Move the rear button support into the clearfog pro support file.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| -rw-r--r-- | arch/arm/boot/dts/armada-388-clearfog.dts | 18 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-388-clearfog.dtsi | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/arch/arm/boot/dts/armada-388-clearfog.dts b/arch/arm/boot/dts/armada-388-clearfog.dts index b56ce4a32519..51887b85dba4 100644 --- a/arch/arm/boot/dts/armada-388-clearfog.dts +++ b/arch/arm/boot/dts/armada-388-clearfog.dts @@ -126,6 +126,20 @@ }; }; }; + + gpio-keys { + compatible = "gpio-keys"; + pinctrl-0 = <&rear_button_pins>; + pinctrl-names = "default"; + + button_0 { + /* The rear SW3 button */ + label = "Rear Button"; + gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; + linux,can-disable; + linux,code = <BTN_0>; + }; + }; }; ð1 { @@ -183,6 +197,10 @@ marvell,pins = "mpp55"; marvell,function = "spi1"; }; + rear_button_pins: rear-button-pins { + marvell,pins = "mpp34"; + marvell,function = "gpio"; + }; }; &spi1 { diff --git a/arch/arm/boot/dts/armada-388-clearfog.dtsi b/arch/arm/boot/dts/armada-388-clearfog.dtsi index 30b75379377a..770d4bff6884 100644 --- a/arch/arm/boot/dts/armada-388-clearfog.dtsi +++ b/arch/arm/boot/dts/armada-388-clearfog.dtsi @@ -240,10 +240,6 @@ marvell,pins = "mpp24", "mpp25"; marvell,function = "ua1"; }; - rear_button_pins: rear-button-pins { - marvell,pins = "mpp34"; - marvell,function = "gpio"; - }; }; sata@a8000 { @@ -299,20 +295,6 @@ }; }; }; - - gpio-keys { - compatible = "gpio-keys"; - pinctrl-0 = <&rear_button_pins>; - pinctrl-names = "default"; - - button_0 { - /* The rear SW3 button */ - label = "Rear Button"; - gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; - linux,can-disable; - linux,code = <BTN_0>; - }; - }; }; &spi1 { |