From 6bbd9367b08bb1486294cf3c322fe40416386fcc Mon Sep 17 00:00:00 2001 From: Gongwei Chen Date: Mon, 27 May 2019 20:04:04 +0800 Subject: [PATCH] dts: modify for S905D3 ac202 mic and loopback [1/1] PD#SWPL-8938 Problem: S905D3 ac202 mic and loopback Solution: modify gpio Verify: Verify by Android P ac202 Change-Id: Ibfd1711eaae0011af8f69a0fd8b35cf1a335ea8e Signed-off-by: GongWei Chen --- arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts | 12 ++++++------ arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts | 12 ++++++------ arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts | 16 ++++++++-------- arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts | 16 ++++++++-------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts index 874c032..f2bca4f 100644 --- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts +++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts @@ -1106,7 +1106,7 @@ #sound-dai-cells = <0>; reg = <0x31>; status = "okay"; - reset_pin = <&gpio GPIOA_5 0>; + reset_pin = <&gpio GPIOAO_9 0>; no_mclk; }; @@ -1406,10 +1406,10 @@ * 4: pdmin; */ datain_src = <4>; - datain_chnum = <6>; - datain_chmask = <0x3f>; + datain_chnum = <4>; + datain_chmask = <0xf>; /* config which data pin for loopback */ - datain-lane-mask-in = <1 1 1 0>; + datain-lane-mask-in = <1 1 0 0>; /* calc mclk for datalb */ mclk-fs = <256>; @@ -1582,8 +1582,8 @@ pdmin: pdmin { mux { /* GPIOA_5, GPIOA_6, GPIOA_8, GPIOA_9, GPIOA_7 */ groups = "pdm_din0_a", - /*"pdm_din1_a",*/ - "pdm_din2_a", + "pdm_din1_a", + /*"pdm_din2_a",*/ /*"pdm_din3_a",*/ "pdm_dclk_a"; function = "pdm"; 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 69d12ba..b67da34 100644 --- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts +++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts @@ -1106,7 +1106,7 @@ #sound-dai-cells = <0>; reg = <0x31>; status = "okay"; - reset_pin = <&gpio GPIOA_5 0>; + reset_pin = <&gpio GPIOAO_9 0>; no_mclk; }; @@ -1405,10 +1405,10 @@ * 4: pdmin; */ datain_src = <4>; - datain_chnum = <6>; - datain_chmask = <0x3f>; + datain_chnum = <4>; + datain_chmask = <0xf>; /* config which data pin for loopback */ - datain-lane-mask-in = <1 1 1 0>; + datain-lane-mask-in = <1 1 0 0>; /* calc mclk for datalb */ mclk-fs = <256>; @@ -1581,8 +1581,8 @@ pdmin: pdmin { mux { /* GPIOA_5, GPIOA_6, GPIOA_8, GPIOA_9, GPIOA_7 */ groups = "pdm_din0_a", - /*"pdm_din1_a",*/ - "pdm_din2_a", + "pdm_din1_a", + /*"pdm_din2_a",*/ /*"pdm_din3_a",*/ "pdm_dclk_a"; function = "pdm"; diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts index d3e0666..69bbaaa 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts @@ -1105,7 +1105,7 @@ #sound-dai-cells = <0>; reg = <0x31>; status = "okay"; - reset_pin = <&gpio GPIOA_5 0>; + reset_pin = <&gpio GPIOAO_9 0>; no_mclk; }; @@ -1402,10 +1402,10 @@ * 4: pdmin; */ datain_src = <4>; - datain_chnum = <6>; - datain_chmask = <0x3f>; + datain_chnum = <4>; + datain_chmask = <0xf>; /* config which data pin for loopback */ - datain-lane-mask-in = <1 1 1 0>; + datain-lane-mask-in = <1 1 0 0>; /* calc mclk for datalb */ mclk-fs = <256>; @@ -1568,10 +1568,10 @@ pdmin: pdmin { mux { /* GPIOA_5, GPIOA_6, GPIOA_8, GPIOA_9, GPIOA_7 */ groups = "pdm_din0_a", - "pdm_din1_a", - "pdm_din2_a", - /*"pdm_din3_a",*/ - "pdm_dclk_a"; + "pdm_din1_a", + /*"pdm_din2_a",*/ + /*"pdm_din3_a",*/ + "pdm_dclk_a"; function = "pdm"; }; }; 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 f89640c..4405938 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts @@ -1105,7 +1105,7 @@ #sound-dai-cells = <0>; reg = <0x31>; status = "okay"; - reset_pin = <&gpio GPIOA_5 0>; + reset_pin = <&gpio GPIOAO_9 0>; no_mclk; }; @@ -1402,10 +1402,10 @@ * 4: pdmin; */ datain_src = <4>; - datain_chnum = <6>; - datain_chmask = <0x3f>; + datain_chnum = <4>; + datain_chmask = <0xf>; /* config which data pin for loopback */ - datain-lane-mask-in = <1 1 1 0>; + datain-lane-mask-in = <1 1 0 0>; /* calc mclk for datalb */ mclk-fs = <256>; @@ -1568,10 +1568,10 @@ pdmin: pdmin { mux { /* GPIOA_5, GPIOA_6, GPIOA_8, GPIOA_9, GPIOA_7 */ groups = "pdm_din0_a", - "pdm_din1_a", - "pdm_din2_a", - /*"pdm_din3_a",*/ - "pdm_dclk_a"; + "pdm_din1_a", + /*"pdm_din2_a",*/ + /*"pdm_din3_a",*/ + "pdm_dclk_a"; function = "pdm"; }; }; -- 2.7.4