From: Gongwei Chen <gongwei.chen@amlogic.com>
Date: Mon, 17 Jun 2019 11:51:04 +0000 (+0800)
Subject: dts: S905D3 gpio keypad [1/1]
X-Git-Tag: khadas-vims-v0.9.6-release~349
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e28ae7ca9d68f292dce2ac9f83ad70c485aafbb;p=platform%2Fkernel%2Flinux-amlogic.git

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 <gongwei.chen@amlogic.com>
---

diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts
index 87362e9..f58688f 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 b948238..b1eb8c2 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 add22c0..ca3e4ea 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 ae429fc..820e5aa 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>;