From 54cbbad955e7c0142aa0f5a52207a29f124c1bfc Mon Sep 17 00:00:00 2001 From: Gongwei Chen Date: Mon, 17 Jun 2019 19:51:04 +0800 Subject: [PATCH] dts: S905D3 gpio keypad [1/1] PD#SWPL-9941 Problem: The camera automatically takes pictures continuously Solution: modify S905D3 gpio keypad in dts Verify: Verify by Android P u202 Change-Id: I4edd1032ac460db296a8938d15ecd6ba1224f0ce Signed-off-by: GongWei Chen --- arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts | 15 +++++++++------ arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts | 15 +++++++++------ arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts | 15 +++++++++------ .../boot/dts/amlogic/sm1_s905d3_ac202_1g.dts | 15 +++++++++------ 4 files changed, 36 insertions(+), 24 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts index b10ca9788cf1..64c1a312f0bc 100644 --- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts +++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts @@ -373,18 +373,21 @@ gpio_keypad{ compatible = "amlogic, gpio_keypad"; - status = "okay"; + status = "disabled"; scan_period = <20>; - key_num = <1>; - key_name = "power"; - key_code = <116>; - key-gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; + key_num = <4>; + key_name = "power", "vol-", "vol+", "mic_mute"; + key_code = <116 114 115 65>; + key-gpios = <&gpio_ao GPIOAO_7 GPIO_ACTIVE_HIGH + &gpio GPIOC_3 GPIO_ACTIVE_HIGH + &gpio GPIOC_0 GPIO_ACTIVE_HIGH + &gpio GPIOA_0 GPIO_ACTIVE_HIGH>; detect_mode = <0>;/*0:polling mode, 1:irq mode*/ }; adc_keypad { compatible = "amlogic, adc_keypad"; - status = "okay"; + status = "disabled"; key_name = "vol-", "vol+", "enter"; key_num = <3>; io-channels = <&saradc SARADC_CH2>; diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts index 3720c69e41af..b29b6b663227 100644 --- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts +++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts @@ -373,18 +373,21 @@ gpio_keypad{ compatible = "amlogic, gpio_keypad"; - status = "okay"; + status = "disabled"; scan_period = <20>; - key_num = <1>; - key_name = "power"; - key_code = <116>; - key-gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; + key_num = <4>; + key_name = "power", "vol-", "vol+", "mic_mute"; + key_code = <116 114 115 65>; + key-gpios = <&gpio_ao GPIOAO_7 GPIO_ACTIVE_HIGH + &gpio GPIOC_3 GPIO_ACTIVE_HIGH + &gpio GPIOC_0 GPIO_ACTIVE_HIGH + &gpio GPIOA_0 GPIO_ACTIVE_HIGH>; detect_mode = <0>;/*0:polling mode, 1:irq mode*/ }; adc_keypad { compatible = "amlogic, adc_keypad"; - status = "okay"; + status = "disabled"; key_name = "vol-", "vol+", "enter"; key_num = <3>; io-channels = <&saradc SARADC_CH2>; diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts index 1d234e8b1d1a..56468786605e 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts @@ -371,18 +371,21 @@ gpio_keypad{ compatible = "amlogic, gpio_keypad"; - status = "okay"; + status = "disabled"; scan_period = <20>; - key_num = <1>; - key_name = "power"; - key_code = <116>; - key-gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; + key_num = <4>; + key_name = "power", "vol-", "vol+", "mic_mute"; + key_code = <116 114 115 65>; + key-gpios = <&gpio_ao GPIOAO_7 GPIO_ACTIVE_HIGH + &gpio GPIOC_3 GPIO_ACTIVE_HIGH + &gpio GPIOC_0 GPIO_ACTIVE_HIGH + &gpio GPIOA_0 GPIO_ACTIVE_HIGH>; detect_mode = <0>;/*0:polling mode, 1:irq mode*/ }; adc_keypad { compatible = "amlogic, adc_keypad"; - status = "okay"; + status = "disabled"; key_name = "vol-", "vol+", "enter"; key_num = <3>; io-channels = <&saradc SARADC_CH2>; diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts index b489181e4f96..da78177cd404 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts @@ -371,18 +371,21 @@ gpio_keypad{ compatible = "amlogic, gpio_keypad"; - status = "okay"; + status = "disabled"; scan_period = <20>; - key_num = <1>; - key_name = "power"; - key_code = <116>; - key-gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; + key_num = <4>; + key_name = "power", "vol-", "vol+", "mic_mute"; + key_code = <116 114 115 65>; + key-gpios = <&gpio_ao GPIOAO_7 GPIO_ACTIVE_HIGH + &gpio GPIOC_3 GPIO_ACTIVE_HIGH + &gpio GPIOC_0 GPIO_ACTIVE_HIGH + &gpio GPIOA_0 GPIO_ACTIVE_HIGH>; detect_mode = <0>;/*0:polling mode, 1:irq mode*/ }; adc_keypad { compatible = "amlogic, adc_keypad"; - status = "okay"; + status = "disabled"; key_name = "vol-", "vol+", "enter"; key_num = <3>; io-channels = <&saradc SARADC_CH2>;