projects / platform / kernel / linux-amlogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6fb7f1d)
dts: S905D3 gpio keypad [1/1]
authorGongwei Chen <gongwei.chen@amlogic.com>
Mon, 17 Jun 2019 11:51:04 +0000 (19:51 +0800)
committerTao Zeng <tao.zeng@amlogic.com>
Tue, 18 Jun 2019 07:48:52 +0000 (00:48 -0700)
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>
arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts patch | blob | history
arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts patch | blob | history
arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts patch | blob | history
arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts patch | blob | history

diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts
index b10ca97..64c1a31 100644 (file)
--- 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 3720c69..b29b6b6 100644 (file)
--- 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 1d234e8..5646878 100644 (file)
--- 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 b489181..da78177 100644 (file)
--- 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>;
Domain: System / Kernel;