mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-28 21:33:52 +00:00
Code Issues Releases Wiki Activity

ARM: dts: rockchip: Split GPIO keys for veyron into multiple devices

Browse source 
With a single device DT overrides can become messy, especially when
keys are added or removed. Multiple devices also allow to
enable/disable wakeup per key/group.

Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
[used actual switch+event constants in new lid-switch entry]
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
This commit is contained in:
Matthias Kaehlcke 2019-06-05 13:43:19 -07:00 committed by Heiko Stuebner
parent cd6386087d
commit b8925b7c2f
4 changed files with 38 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi
View file

@ -70,6 +70,21 @@ gpio-charger {
pinctrl-0 = <&ac_present_ap>;
};
lid_switch: lid-switch {
compatible = "gpio-keys";
pinctrl-names = "default";
pinctrl-0 = <&ap_lid_int_l>;
lid {
label = "Lid";
gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_LOW>;
wakeup-source;
linux,code = <SW_LID>;
linux,input-type = <EV_SW>;
debounce-interval = <1>;
};
};
panel: panel {
compatible ="innolux,n116bge", "simple-panel";
status = "okay";
@ -149,18 +164,6 @@ &edp_phy {
status = "okay";
};
&gpio_keys {
pinctrl-0 = <&pwr_key_l &ap_lid_int_l>;
lid {
label = "Lid";
gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_LOW>;
wakeup-source;
linux,code = <0>; /* SW_LID */
linux,input-type = <5>; /* EV_SW */
debounce-interval = <1>;
};
};
&pwm0 {
status = "okay";
};

38
arch/arm/boot/dts/rk3288-veyron-minnie.dts
View file

@ -48,6 +48,26 @@ vcc18_lcd: vcc18-lcd {
regulator-boot-on;
vin-supply = <&vcc18_wl>;
};
volume_buttons: volume-buttons {
compatible = "gpio-keys";
pinctrl-names = "default";
pinctrl-0 = <&volum_down_l &volum_up_l>;
volum_down {
label = "Volum_down";
gpios = <&gpio5 RK_PB3 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEDOWN>;
debounce-interval = <100>;
};
volum_up {
label = "Volum_up";
gpios = <&gpio5 RK_PB2 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
debounce-interval = <100>;
};
};
};
&backlight {
@ -90,24 +110,6 @@ &backlight {
pwm-off-delay-ms = <200>;
};
&gpio_keys {
pinctrl-0 = <&pwr_key_l &ap_lid_int_l &volum_down_l &volum_up_l>;
volum_down {
label = "Volum_down";
gpios = <&gpio5 RK_PB3 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEDOWN>;
debounce-interval = <100>;
};
volum_up {
label = "Volum_up";
gpios = <&gpio5 RK_PB2 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
debounce-interval = <100>;
};
};
&i2c_tunnel {
battery: bq27500@55 {
compatible = "ti,bq27500";

2
arch/arm/boot/dts/rk3288-veyron-pinky.dts
View file

@ -35,7 +35,7 @@ &edp {
force-hpd;
};
&gpio_keys {
&lid_switch {
pinctrl-0 = <&pwr_key_h &ap_lid_int_l>;
power {

4
arch/arm/boot/dts/rk3288-veyron.dtsi
View file

@ -23,11 +23,11 @@ memory {
reg = <0x0 0x0 0x0 0x80000000>;
};
gpio_keys: gpio-keys {
power_button: power-button {
compatible = "gpio-keys";
pinctrl-names = "default";
pinctrl-0 = <&pwr_key_l>;
power {
label = "Power";
gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;