p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
This commit is contained in:
Russell King 2017-01-02 14:59:12 +00:00 committed by Gregory CLEMENT
parent 869fe59cd1
commit b8e98db0dc
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/arm/boot/dts/armada-388-clearfog.dts
View File

@ -126,6 +126,20 @@ fixed-link {
}; };
}; };
}; };
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>;
};
};
}; };
&eth1 { &eth1 {
@ -183,6 +197,10 @@ clearfog_spi1_cs_pins: spi1-cs-pins {
marvell,pins = "mpp55"; marvell,pins = "mpp55";
marvell,function = "spi1"; marvell,function = "spi1";
}; };
rear_button_pins: rear-button-pins {
marvell,pins = "mpp34";
marvell,function = "gpio";
};
}; };
&spi1 { &spi1 {

18
arch/arm/boot/dts/armada-388-clearfog.dtsi
View File

@ -240,10 +240,6 @@ mikro_uart_pins: mikro-uart-pins {
marvell,pins = "mpp24", "mpp25"; marvell,pins = "mpp24", "mpp25";
marvell,function = "ua1"; marvell,function = "ua1";
}; };
rear_button_pins: rear-button-pins {
marvell,pins = "mpp34";
marvell,function = "gpio";
};
}; };
sata@a8000 { sata@a8000 {
@ -299,20 +295,6 @@ pcie@2,0 {
}; };
}; };
}; };
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 { &spi1 {