From 1a3bafc40a92b679f88e09adafe442a9574712ab Mon Sep 17 00:00:00 2001 From: "xingyu.chen" Date: Wed, 9 Aug 2017 09:14:46 +0800 Subject: [PATCH] dts: replace the "voice" key with "power" key for axg PD#147852: dts: replace the "voice" key with "power" key for axg Change-Id: If565f833c5525e5bb3f1ae5989bd6021244f7b5c Signed-off-by: xingyu.chen --- arch/arm64/boot/dts/amlogic/axg_a113d_skt.dts | 14 ++++++++++++++ arch/arm64/boot/dts/amlogic/axg_a113x_skt.dts | 4 ++-- arch/arm64/boot/dts/amlogic/axg_s400.dts | 4 ++-- arch/arm64/boot/dts/amlogic/axg_s400_v03.dts | 4 ++-- arch/arm64/boot/dts/amlogic/axg_s420.dts | 4 ++-- arch/arm64/boot/dts/amlogic/axg_s420_v03.dts | 4 ++-- 6 files changed, 24 insertions(+), 10 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/axg_a113d_skt.dts b/arch/arm64/boot/dts/amlogic/axg_a113d_skt.dts index 3f6216e..631028f 100644 --- a/arch/arm64/boot/dts/amlogic/axg_a113d_skt.dts +++ b/arch/arm64/boot/dts/amlogic/axg_a113d_skt.dts @@ -621,6 +621,20 @@ mask = <4>; }; }; + + adc_keypad { + compatible = "amlogic, adc_keypad"; + status = "okay"; + key_name = "power", "vol-", "vol+", "wifi", "<<", ">>"; + key_num = <6>; + io-channels = <&saradc SARADC_CH0>; + io-channel-names = "key-chan-0"; + key_chan = ; + key_code = <116 114 115 139 105 106>; + key_val = <0 143 266 389 512 635>; //val=voltage/1800mV*1023 + key_tolerance = <40 40 40 40 40 40>; + }; }; /* end of / */ /* Audio Related start */ diff --git a/arch/arm64/boot/dts/amlogic/axg_a113x_skt.dts b/arch/arm64/boot/dts/amlogic/axg_a113x_skt.dts index 7abd0a6..76340b0 100644 --- a/arch/arm64/boot/dts/amlogic/axg_a113x_skt.dts +++ b/arch/arm64/boot/dts/amlogic/axg_a113x_skt.dts @@ -553,13 +553,13 @@ adc_keypad { compatible = "amlogic, adc_keypad"; status = "okay"; - key_name = "voice", "vol-", "vol+", "wifi", "<<", ">>"; + key_name = "power", "vol-", "vol+", "wifi", "<<", ">>"; key_num = <6>; io-channels = <&saradc SARADC_CH0>; io-channel-names = "key-chan-0"; key_chan = ; - key_code = <164 114 115 139 105 106>; + key_code = <116 114 115 139 105 106>; key_val = <0 143 266 389 512 635>; //val=voltage/1800mV*1023 key_tolerance = <40 40 40 40 40 40>; }; diff --git a/arch/arm64/boot/dts/amlogic/axg_s400.dts b/arch/arm64/boot/dts/amlogic/axg_s400.dts index fd66b34..e3e4c6d 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s400.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s400.dts @@ -783,13 +783,13 @@ adc_keypad { compatible = "amlogic, adc_keypad"; status = "okay"; - key_name = "voice", "vol-", "vol+", "wifi", "<<", ">>"; + key_name = "power", "vol-", "vol+", "wifi", "<<", ">>"; key_num = <6>; io-channels = <&saradc SARADC_CH0>; io-channel-names = "key-chan-0"; key_chan = ; - key_code = <164 114 115 139 105 106>; + key_code = <116 114 115 139 105 106>; key_val = <0 143 266 389 512 635>; //val=voltage/1800mV*1023 key_tolerance = <40 40 40 40 40 40>; }; diff --git a/arch/arm64/boot/dts/amlogic/axg_s400_v03.dts b/arch/arm64/boot/dts/amlogic/axg_s400_v03.dts index 28f895e..f5d467f 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s400_v03.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s400_v03.dts @@ -780,13 +780,13 @@ adc_keypad { compatible = "amlogic, adc_keypad"; status = "okay"; - key_name = "voice", "vol-", "vol+", "wifi", "<<", ">>"; + key_name = "power", "vol-", "vol+", "wifi", "<<", ">>"; key_num = <6>; io-channels = <&saradc SARADC_CH0>; io-channel-names = "key-chan-0"; key_chan = ; - key_code = <164 114 115 139 105 106>; + key_code = <116 114 115 139 105 106>; key_val = <0 143 266 389 512 635>; //val=voltage/1800mV*1023 key_tolerance = <40 40 40 40 40 40>; }; diff --git a/arch/arm64/boot/dts/amlogic/axg_s420.dts b/arch/arm64/boot/dts/amlogic/axg_s420.dts index 6f87f8b..e8695f5 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s420.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s420.dts @@ -553,13 +553,13 @@ adc_keypad { compatible = "amlogic, adc_keypad"; status = "okay"; - key_name = "voice", "vol-", "vol+", "wifi", "<<", ">>"; + key_name = "power", "vol-", "vol+", "wifi", "<<", ">>"; key_num = <6>; io-channels = <&saradc SARADC_CH0>; io-channel-names = "key-chan-0"; key_chan = ; - key_code = <164 114 115 139 105 106>; + key_code = <116 114 115 139 105 106>; key_val = <0 143 266 389 512 635>; //val=voltage/1800mV*1023 key_tolerance = <40 40 40 40 40 40>; }; diff --git a/arch/arm64/boot/dts/amlogic/axg_s420_v03.dts b/arch/arm64/boot/dts/amlogic/axg_s420_v03.dts index 7b41774..d6bc95b 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s420_v03.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s420_v03.dts @@ -554,13 +554,13 @@ adc_keypad { compatible = "amlogic, adc_keypad"; status = "okay"; - key_name = "voice", "vol-", "vol+", "wifi", "<<", ">>"; + key_name = "power", "vol-", "vol+", "wifi", "<<", ">>"; key_num = <6>; io-channels = <&saradc SARADC_CH0>; io-channel-names = "key-chan-0"; key_chan = ; - key_code = <164 114 115 139 105 106>; + key_code = <116 114 115 139 105 106>; key_val = <0 143 266 389 512 635>; //val=voltage/1800mV*1023 key_tolerance = <40 40 40 40 40 40>; }; -- 2.7.4