diff --git a/arch/arm64/boot/dts/amlogic/mesons5.dtsi b/arch/arm64/boot/dts/amlogic/mesons5.dtsi index ef24fbde8..67ca690ce 100644 --- a/arch/arm64/boot/dts/amlogic/mesons5.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesons5.dtsi @@ -16,6 +16,7 @@ #include #include #include +#include #include "meson-ir-map.dtsi" #include "meson-valhall.dtsi" //#include diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201.dts index 8d2c417e8..7cbf9909d 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201.dts @@ -926,13 +926,14 @@ adc_keypad { compatible = "amlogic, adc_keypad"; status = "okay"; - key_name = "key_a", "key_b", "key_c"; + key_name = "vol-", "vol+", "power"; key_num = <3>; - io-channels = <&saradc 0>; + io-channels = <&saradc SARADC_CH0>; io-channel-names = "key-chan-0"; - key_chan = <0 0 0>; - key_code = <141 114 115>; - key_val = <900 511 0>; //val=voltage/1800mV*1023 + key_chan = ; + key_code = ; + /* val = voltage / 1800mV * 1023 */ + key_val = <630 910 20>; key_tolerance = <40 40 40>; mboxes = <&mbox_fifo S5_REE2AO_KEYPAD>; }; diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_drm.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_drm.dts index 89cd5c423..8b0441b74 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_drm.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_drm.dts @@ -927,13 +927,14 @@ adc_keypad { compatible = "amlogic, adc_keypad"; status = "okay"; - key_name = "key_a", "key_b", "key_c"; + key_name = "vol-", "vol+", "power"; key_num = <3>; - io-channels = <&saradc 0>; + io-channels = <&saradc SARADC_CH0>; io-channel-names = "key-chan-0"; - key_chan = <0 0 0>; - key_code = <141 114 115>; - key_val = <900 511 0>; //val=voltage/1800mV*1023 + key_chan = ; + key_code = ; + /* val = voltage / 1800mV * 1023 */ + key_val = <630 910 20>; key_tolerance = <40 40 40>; mboxes = <&mbox_fifo S5_REE2AO_KEYPAD>; }; diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_linux.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_linux.dts index 9476f29e9..a5ad0e256 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_linux.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_linux.dts @@ -925,13 +925,14 @@ adc_keypad { compatible = "amlogic, adc_keypad"; status = "okay"; - key_name = "key_a", "key_b", "key_c"; + key_name = "vol-", "vol+", "power"; key_num = <3>; - io-channels = <&saradc 0>; + io-channels = <&saradc SARADC_CH0>; io-channel-names = "key-chan-0"; - key_chan = <0 0 0>; - key_code = <141 114 115>; - key_val = <900 511 0>; //val=voltage/1800mV*1023 + key_chan = ; + key_code = ; + /* val = voltage / 1800mV * 1023 */ + key_val = <630 910 20>; key_tolerance = <40 40 40>; mboxes = <&mbox_fifo S5_REE2AO_KEYPAD>; }; diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_mxl258c_drm.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_mxl258c_drm.dts index 681fa8f62..d01d3a66d 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_mxl258c_drm.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_mxl258c_drm.dts @@ -1011,14 +1011,16 @@ adc_keypad { compatible = "amlogic, adc_keypad"; status = "okay"; - key_name = "key_a", "key_b", "key_c"; + key_name = "vol-", "vol+", "power"; key_num = <3>; - io-channels = <&saradc 0>; + io-channels = <&saradc SARADC_CH0>; io-channel-names = "key-chan-0"; - key_chan = <0 0 0>; - key_code = <141 114 115>; - key_val = <900 511 0>; //val=voltage/1800mV*1023 + key_chan = ; + key_code = ; + /* val = voltage / 1800mV * 1023 */ + key_val = <630 910 20>; key_tolerance = <40 40 40>; + mboxes = <&mbox_fifo S5_REE2AO_KEYPAD>; }; vddnpu: pwm_ef-regulator { diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2.dts index 9423781a0..cfb6eda5a 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2.dts @@ -926,13 +926,14 @@ adc_keypad { compatible = "amlogic, adc_keypad"; status = "okay"; - key_name = "key_a", "key_b", "key_c"; + key_name = "vol-", "vol+", "power"; key_num = <3>; - io-channels = <&saradc 0>; + io-channels = <&saradc SARADC_CH0>; io-channel-names = "key-chan-0"; - key_chan = <0 0 0>; - key_code = <141 114 115>; - key_val = <900 511 0>; //val=voltage/1800mV*1023 + key_chan = ; + key_code = ; + /* val = voltage / 1800mV * 1023 */ + key_val = <630 910 20>; key_tolerance = <40 40 40>; mboxes = <&mbox_fifo S5_REE2AO_KEYPAD>; }; diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_drm.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_drm.dts index 703a7ca74..c5bf196e1 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_drm.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_drm.dts @@ -927,13 +927,14 @@ adc_keypad { compatible = "amlogic, adc_keypad"; status = "okay"; - key_name = "key_a", "key_b", "key_c"; + key_name = "vol-", "vol+", "power"; key_num = <3>; - io-channels = <&saradc 0>; + io-channels = <&saradc SARADC_CH0>; io-channel-names = "key-chan-0"; - key_chan = <0 0 0>; - key_code = <141 114 115>; - key_val = <900 511 0>; //val=voltage/1800mV*1023 + key_chan = ; + key_code = ; + /* val = voltage / 1800mV * 1023 */ + key_val = <630 910 20>; key_tolerance = <40 40 40>; mboxes = <&mbox_fifo S5_REE2AO_KEYPAD>; }; diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_linux.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_linux.dts index f9d19ec44..7a561e87c 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_linux.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_linux.dts @@ -925,13 +925,14 @@ adc_keypad { compatible = "amlogic, adc_keypad"; status = "okay"; - key_name = "key_a", "key_b", "key_c"; + key_name = "vol-", "vol+", "power"; key_num = <3>; - io-channels = <&saradc 0>; + io-channels = <&saradc SARADC_CH0>; io-channel-names = "key-chan-0"; - key_chan = <0 0 0>; - key_code = <141 114 115>; - key_val = <900 511 0>; //val=voltage/1800mV*1023 + key_chan = ; + key_code = ; + /* val = voltage / 1800mV * 1023 */ + key_val = <630 910 20>; key_tolerance = <40 40 40>; mboxes = <&mbox_fifo S5_REE2AO_KEYPAD>; }; diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_mxl258c_drm.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_mxl258c_drm.dts index f9183b7f4..d3449faf5 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_mxl258c_drm.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_mxl258c_drm.dts @@ -1011,14 +1011,16 @@ adc_keypad { compatible = "amlogic, adc_keypad"; status = "okay"; - key_name = "key_a", "key_b", "key_c"; + key_name = "vol-", "vol+", "power"; key_num = <3>; - io-channels = <&saradc 0>; + io-channels = <&saradc SARADC_CH0>; io-channel-names = "key-chan-0"; - key_chan = <0 0 0>; - key_code = <141 114 115>; - key_val = <900 511 0>; //val=voltage/1800mV*1023 + key_chan = ; + key_code = ; + /* val = voltage / 1800mV * 1023 */ + key_val = <630 910 20>; key_tolerance = <40 40 40>; + mboxes = <&mbox_fifo S5_REE2AO_KEYPAD>; }; vddnpu_dvo_dos_vpu: pwm_ef-regulator { diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax208.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax208.dts index 525857bf1..5ea647a33 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax208.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax208.dts @@ -925,13 +925,14 @@ adc_keypad { compatible = "amlogic, adc_keypad"; status = "okay"; - key_name = "key_a", "key_b", "key_c"; + key_name = "vol-", "vol+", "power"; key_num = <3>; - io-channels = <&saradc 0>; + io-channels = <&saradc SARADC_CH0>; io-channel-names = "key-chan-0"; - key_chan = <0 0 0>; - key_code = <141 114 115>; - key_val = <900 511 0>; //val=voltage/1800mV*1023 + key_chan = ; + key_code = ; + /* val = voltage / 1800mV * 1023 */ + key_val = <511 900 0>; key_tolerance = <40 40 40>; mboxes = <&mbox_fifo S5_REE2AO_KEYPAD>; }; diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax208_v2.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax208_v2.dts index 807d89747..aca8357dc 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax208_v2.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax208_v2.dts @@ -925,13 +925,14 @@ adc_keypad { compatible = "amlogic, adc_keypad"; status = "okay"; - key_name = "key_a", "key_b", "key_c"; + key_name = "vol-", "vol+", "power"; key_num = <3>; - io-channels = <&saradc 0>; + io-channels = <&saradc SARADC_CH0>; io-channel-names = "key-chan-0"; - key_chan = <0 0 0>; - key_code = <141 114 115>; - key_val = <900 511 0>; //val=voltage/1800mV*1023 + key_chan = ; + key_code = ; + /* val = voltage / 1800mV * 1023 */ + key_val = <511 900 0>; key_tolerance = <40 40 40>; mboxes = <&mbox_fifo S5_REE2AO_KEYPAD>; }; diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax209.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax209.dts index fb4fa4f38..251f4756d 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax209.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax209.dts @@ -906,13 +906,14 @@ adc_keypad { compatible = "amlogic, adc_keypad"; status = "okay"; - key_name = "key_a", "key_b", "key_c"; + key_name = "vol-", "vol+", "power"; key_num = <3>; - io-channels = <&saradc 0>; + io-channels = <&saradc SARADC_CH0>; io-channel-names = "key-chan-0"; - key_chan = <0 0 0>; - key_code = <141 114 115>; - key_val = <900 511 0>; //val=voltage/1800mV*1023 + key_chan = ; + key_code = ; + /* val = voltage / 1800mV * 1023 */ + key_val = <511 900 0>; key_tolerance = <40 40 40>; mboxes = <&mbox_fifo S5_REE2AO_KEYPAD>; }; diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax209_v2.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax209_v2.dts index 1032a0a08..d54d56b74 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax209_v2.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax209_v2.dts @@ -906,13 +906,14 @@ adc_keypad { compatible = "amlogic, adc_keypad"; status = "okay"; - key_name = "key_a", "key_b", "key_c"; + key_name = "vol-", "vol+", "power"; key_num = <3>; - io-channels = <&saradc 0>; + io-channels = <&saradc SARADC_CH0>; io-channel-names = "key-chan-0"; - key_chan = <0 0 0>; - key_code = <141 114 115>; - key_val = <900 511 0>; //val=voltage/1800mV*1023 + key_chan = ; + key_code = ; + /* val = voltage / 1800mV * 1023 */ + key_val = <511 900 0>; key_tolerance = <40 40 40>; mboxes = <&mbox_fifo S5_REE2AO_KEYPAD>; };