mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

arm64: dts: rockchip: fix adc-keys sub node names 

Fix adc-keys sub node names on Rockchip boards,
so that they match with regex: '^button-'

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Link: https://lore.kernel.org/r/6a6a3603-5540-cacc-2672-c015af1ec684@gmail.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
This commit is contained in:
Johan Jonker 2022-10-27 10:38:35 +02:00 committed by Heiko Stuebner
parent 942b35de22
commit f2bd2e76d6
10 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm64/boot/dts/rockchip/px30-evb.dts
View File

@ -30,31 +30,31 @@
keyup-threshold-microvolt = <1800000>; keyup-threshold-microvolt = <1800000>;
poll-interval = <100>; poll-interval = <100>;
esc-key { button-esc {
label = "esc"; label = "esc";
linux,code = <KEY_ESC>; linux,code = <KEY_ESC>;
press-threshold-microvolt = <1310000>; press-threshold-microvolt = <1310000>;
}; };
home-key { button-home {
label = "home"; label = "home";
linux,code = <KEY_HOME>; linux,code = <KEY_HOME>;
press-threshold-microvolt = <624000>; press-threshold-microvolt = <624000>;
}; };
menu-key { button-menu {
label = "menu"; label = "menu";
linux,code = <KEY_MENU>; linux,code = <KEY_MENU>;
press-threshold-microvolt = <987000>; press-threshold-microvolt = <987000>;
}; };
vol-down-key { button-down {
label = "volume down"; label = "volume down";
linux,code = <KEY_VOLUMEDOWN>; linux,code = <KEY_VOLUMEDOWN>;
press-threshold-microvolt = <300000>; press-threshold-microvolt = <300000>;
}; };
vol-up-key { button-up {
label = "volume up"; label = "volume up";
linux,code = <KEY_VOLUMEUP>; linux,code = <KEY_VOLUMEUP>;
press-threshold-microvolt = <17000>; press-threshold-microvolt = <17000>;

12
arch/arm64/boot/dts/rockchip/rk3308-evb.dts
View File

@ -23,7 +23,7 @@
poll-interval = <100>; poll-interval = <100>;
keyup-threshold-microvolt = <1800000>; keyup-threshold-microvolt = <1800000>;
func-key { button-func {
linux,code = <KEY_FN>; linux,code = <KEY_FN>;
label = "function"; label = "function";
press-threshold-microvolt = <18000>; press-threshold-microvolt = <18000>;
@ -37,31 +37,31 @@
poll-interval = <100>; poll-interval = <100>;
keyup-threshold-microvolt = <1800000>; keyup-threshold-microvolt = <1800000>;
esc-key { button-esc {
linux,code = <KEY_MICMUTE>; linux,code = <KEY_MICMUTE>;
label = "micmute"; label = "micmute";
press-threshold-microvolt = <1130000>; press-threshold-microvolt = <1130000>;
}; };
home-key { button-home {
linux,code = <KEY_MODE>; linux,code = <KEY_MODE>;
label = "mode"; label = "mode";
press-threshold-microvolt = <901000>; press-threshold-microvolt = <901000>;
}; };
menu-key { button-menu {
linux,code = <KEY_PLAY>; linux,code = <KEY_PLAY>;
label = "play"; label = "play";
press-threshold-microvolt = <624000>; press-threshold-microvolt = <624000>;
}; };
vol-down-key { button-down {
linux,code = <KEY_VOLUMEDOWN>; linux,code = <KEY_VOLUMEDOWN>;
label = "volume down"; label = "volume down";
press-threshold-microvolt = <300000>; press-threshold-microvolt = <300000>;
}; };
vol-up-key { button-up {
linux,code = <KEY_VOLUMEUP>; linux,code = <KEY_VOLUMEUP>;
label = "volume up"; label = "volume up";
press-threshold-microvolt = <18000>; press-threshold-microvolt = <18000>;

2
arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts
View File

@ -25,7 +25,7 @@
keyup-threshold-microvolt = <1800000>; keyup-threshold-microvolt = <1800000>;
poll-interval = <100>; poll-interval = <100>;
recovery { button-recovery {
label = "recovery"; label = "recovery";
linux,code = <KEY_VENDOR>; linux,code = <KEY_VENDOR>;
press-threshold-microvolt = <17000>; press-threshold-microvolt = <17000>;

2
arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi
View File

@ -123,7 +123,7 @@
keyup-threshold-microvolt = <1800000>; keyup-threshold-microvolt = <1800000>;
poll-interval = <100>; poll-interval = <100>;
recovery { button-recovery {
label = "Recovery"; label = "Recovery";
linux,code = <KEY_VENDOR>; linux,code = <KEY_VENDOR>;
press-threshold-microvolt = <18000>; press-threshold-microvolt = <18000>;

2
arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts
View File

@ -39,7 +39,7 @@
keyup-threshold-microvolt = <1800000>; keyup-threshold-microvolt = <1800000>;
poll-interval = <100>; poll-interval = <100>;
recovery { button-recovery {
label = "Recovery"; label = "Recovery";
linux,code = <KEY_VENDOR>; linux,code = <KEY_VENDOR>;
press-threshold-microvolt = <18000>; press-threshold-microvolt = <18000>;

2
arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4b.dts
View File

@ -19,7 +19,7 @@
keyup-threshold-microvolt = <1500000>; keyup-threshold-microvolt = <1500000>;
poll-interval = <100>; poll-interval = <100>;
recovery { button-recovery {
label = "Recovery"; label = "Recovery";
linux,code = <KEY_VENDOR>; linux,code = <KEY_VENDOR>;
press-threshold-microvolt = <18000>; press-threshold-microvolt = <18000>;

4
arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts
View File

@ -52,13 +52,13 @@
press-threshold-microvolt = <300000>; press-threshold-microvolt = <300000>;
}; };
back { button-back {
label = "Back"; label = "Back";
linux,code = <KEY_BACK>; linux,code = <KEY_BACK>;
press-threshold-microvolt = <985000>; press-threshold-microvolt = <985000>;
}; };
menu { button-menu {
label = "Menu"; label = "Menu";
linux,code = <KEY_MENU>; linux,code = <KEY_MENU>;
press-threshold-microvolt = <1314000>; press-threshold-microvolt = <1314000>;

2
arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
View File

@ -41,7 +41,7 @@
keyup-threshold-microvolt = <1500000>; keyup-threshold-microvolt = <1500000>;
poll-interval = <100>; poll-interval = <100>;
recovery { button-recovery {
label = "Recovery"; label = "Recovery";
linux,code = <KEY_VENDOR>; linux,code = <KEY_VENDOR>;
press-threshold-microvolt = <18000>; press-threshold-microvolt = <18000>;

4
arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
View File

@ -33,13 +33,13 @@
press-threshold-microvolt = <300000>; press-threshold-microvolt = <300000>;
}; };
back { button-back {
label = "Back"; label = "Back";
linux,code = <KEY_BACK>; linux,code = <KEY_BACK>;
press-threshold-microvolt = <985000>; press-threshold-microvolt = <985000>;
}; };
menu { button-menu {
label = "Menu"; label = "Menu";
linux,code = <KEY_MENU>; linux,code = <KEY_MENU>;
press-threshold-microvolt = <1314000>; press-threshold-microvolt = <1314000>;

2
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
View File

@ -23,7 +23,7 @@
io-channel-names = "buttons"; io-channel-names = "buttons";
keyup-threshold-microvolt = <1750000>; keyup-threshold-microvolt = <1750000>;
recovery { button-recovery {
label = "recovery"; label = "recovery";
linux,code = <KEY_VENDOR>; linux,code = <KEY_VENDOR>;
press-threshold-microvolt = <0>; press-threshold-microvolt = <0>;