Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Johan Jonker and committed by
Heiko Stuebner
f2bd2e76 942b35de

+21 -21
+5 -5
arch/arm64/boot/dts/rockchip/px30-evb.dts
··· 30 30 keyup-threshold-microvolt = <1800000>; 31 31 poll-interval = <100>; 32 32 33 - esc-key { 33 + button-esc { 34 34 label = "esc"; 35 35 linux,code = <KEY_ESC>; 36 36 press-threshold-microvolt = <1310000>; 37 37 }; 38 38 39 - home-key { 39 + button-home { 40 40 label = "home"; 41 41 linux,code = <KEY_HOME>; 42 42 press-threshold-microvolt = <624000>; 43 43 }; 44 44 45 - menu-key { 45 + button-menu { 46 46 label = "menu"; 47 47 linux,code = <KEY_MENU>; 48 48 press-threshold-microvolt = <987000>; 49 49 }; 50 50 51 - vol-down-key { 51 + button-down { 52 52 label = "volume down"; 53 53 linux,code = <KEY_VOLUMEDOWN>; 54 54 press-threshold-microvolt = <300000>; 55 55 }; 56 56 57 - vol-up-key { 57 + button-up { 58 58 label = "volume up"; 59 59 linux,code = <KEY_VOLUMEUP>; 60 60 press-threshold-microvolt = <17000>;
+6 -6
arch/arm64/boot/dts/rockchip/rk3308-evb.dts
··· 23 23 poll-interval = <100>; 24 24 keyup-threshold-microvolt = <1800000>; 25 25 26 - func-key { 26 + button-func { 27 27 linux,code = <KEY_FN>; 28 28 label = "function"; 29 29 press-threshold-microvolt = <18000>; ··· 37 37 poll-interval = <100>; 38 38 keyup-threshold-microvolt = <1800000>; 39 39 40 - esc-key { 40 + button-esc { 41 41 linux,code = <KEY_MICMUTE>; 42 42 label = "micmute"; 43 43 press-threshold-microvolt = <1130000>; 44 44 }; 45 45 46 - home-key { 46 + button-home { 47 47 linux,code = <KEY_MODE>; 48 48 label = "mode"; 49 49 press-threshold-microvolt = <901000>; 50 50 }; 51 51 52 - menu-key { 52 + button-menu { 53 53 linux,code = <KEY_PLAY>; 54 54 label = "play"; 55 55 press-threshold-microvolt = <624000>; 56 56 }; 57 57 58 - vol-down-key { 58 + button-down { 59 59 linux,code = <KEY_VOLUMEDOWN>; 60 60 label = "volume down"; 61 61 press-threshold-microvolt = <300000>; 62 62 }; 63 63 64 - vol-up-key { 64 + button-up { 65 65 linux,code = <KEY_VOLUMEUP>; 66 66 label = "volume up"; 67 67 press-threshold-microvolt = <18000>;
+1 -1
arch/arm64/boot/dts/rockchip/rk3318-a95x-z2.dts
··· 25 25 keyup-threshold-microvolt = <1800000>; 26 26 poll-interval = <100>; 27 27 28 - recovery { 28 + button-recovery { 29 29 label = "recovery"; 30 30 linux,code = <KEY_VENDOR>; 31 31 press-threshold-microvolt = <17000>;
+1 -1
arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi
··· 123 123 keyup-threshold-microvolt = <1800000>; 124 124 poll-interval = <100>; 125 125 126 - recovery { 126 + button-recovery { 127 127 label = "Recovery"; 128 128 linux,code = <KEY_VENDOR>; 129 129 press-threshold-microvolt = <18000>;
+1 -1
arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts
··· 39 39 keyup-threshold-microvolt = <1800000>; 40 40 poll-interval = <100>; 41 41 42 - recovery { 42 + button-recovery { 43 43 label = "Recovery"; 44 44 linux,code = <KEY_VENDOR>; 45 45 press-threshold-microvolt = <18000>;
+1 -1
arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4b.dts
··· 19 19 keyup-threshold-microvolt = <1500000>; 20 20 poll-interval = <100>; 21 21 22 - recovery { 22 + button-recovery { 23 23 label = "Recovery"; 24 24 linux,code = <KEY_VENDOR>; 25 25 press-threshold-microvolt = <18000>;
+2 -2
arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts
··· 52 52 press-threshold-microvolt = <300000>; 53 53 }; 54 54 55 - back { 55 + button-back { 56 56 label = "Back"; 57 57 linux,code = <KEY_BACK>; 58 58 press-threshold-microvolt = <985000>; 59 59 }; 60 60 61 - menu { 61 + button-menu { 62 62 label = "Menu"; 63 63 linux,code = <KEY_MENU>; 64 64 press-threshold-microvolt = <1314000>;
+1 -1
arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
··· 41 41 keyup-threshold-microvolt = <1500000>; 42 42 poll-interval = <100>; 43 43 44 - recovery { 44 + button-recovery { 45 45 label = "Recovery"; 46 46 linux,code = <KEY_VENDOR>; 47 47 press-threshold-microvolt = <18000>;
+2 -2
arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
··· 33 33 press-threshold-microvolt = <300000>; 34 34 }; 35 35 36 - back { 36 + button-back { 37 37 label = "Back"; 38 38 linux,code = <KEY_BACK>; 39 39 press-threshold-microvolt = <985000>; 40 40 }; 41 41 42 - menu { 42 + button-menu { 43 43 label = "Menu"; 44 44 linux,code = <KEY_MENU>; 45 45 press-threshold-microvolt = <1314000>;
+1 -1
arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
··· 23 23 io-channel-names = "buttons"; 24 24 keyup-threshold-microvolt = <1750000>; 25 25 26 - recovery { 26 + button-recovery { 27 27 label = "recovery"; 28 28 linux,code = <KEY_VENDOR>; 29 29 press-threshold-microvolt = <0>;