common: loudspeaker: adjust for yeke [1/1]

PD#SWPL-8201

Problem:
loudspeaker ad82584f for yeke.

Solution:
loudspeaker ad82584f for yeke.

Verify:
S905D2 u202.

Change-Id: I01fe62d207c47283e714937282a0ba24aef1d467
Signed-off-by: GongWei Chen <gongwei.chen@amlogic.com>

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_u202.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_u202.dts
index 89cddc8..c61e9fe 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905d2_u202.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_u202.dts
@@ -576,7 +576,7 @@
                aml-audio-card,loopback = <&aml_loopback>;
                aml-audio-card,aux-devs = <&amlogic_codec>;
                /*avout mute gpio*/
-               avout_mute-gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>;
+               avout_mute-gpios = <&gpio_ao GPIOAO_8 GPIO_ACTIVE_HIGH>;
                /*for audio effect ,eqdrc */
                aml-audio-card,effect = <&audio_effect>;
 
@@ -663,7 +663,7 @@
                                system-clock-frequency = <12288000>;
                        };
                        codec {
-                               sound-dai = <&tlv320adc3101_32 &dummy_codec>;
+                               sound-dai = <&dummy_codec>;
                        };
                };
 
@@ -927,7 +927,7 @@
        cpufreq-meson {
                compatible = "amlogic, cpufreq-meson";
                pinctrl-names = "default";
-               pinctrl-0 = <&pwm_ao_d_pins3>;
+               /*pinctrl-0 = <&pwm_ao_d_pins3>;*/
                status = "okay";
        };
 
@@ -1043,7 +1043,8 @@
                #sound-dai-cells = <0>;
                reg = <0x31>;
                status = "okay";
-               reset_pin = <&gpio GPIOA_5 0>;
+               reset_pin = <&gpio_ao GPIOAO_9 0>;
+               enable_pin = <&gpio GPIOC_4 0>;
        };
 
        tlv320adc3101_32: tlv320adc3101_32@32 {
@@ -1051,7 +1052,7 @@
                #sound-dai-cells = <0>;
                reg = <0x19>;
                differential_pair = <1>;
-               status = "okay";
+               status = "disabled";
        };
 
        tas5707_36: tas5707_36@36 {
@@ -1059,7 +1060,7 @@
                #sound-dai-cells = <0>;
                reg = <0x1b>;
                status = "disabled";
-               reset_pin = <&gpio GPIOA_5 0>;
+       /*      reset_pin = <&gpio GPIOA_5 0>;*/
        };
 
        bl_extern_i2c {
@@ -1195,6 +1196,9 @@
                 */
                lb_mode = <0>;
 
+               clocks = <&clkc CLKID_MPLL2>;
+               clock-names = "datalb_mpll";
+
                /* datain src
                 * 0: tdmin_a;
                 * 1: tdmin_b;
@@ -1214,8 +1218,9 @@
                 * 4: PAD_tdminB
                 * 5: PAD_tdminC
                 */
-               datalb_src = <2>;
-               datalb_chnum = <8>;
+               datalb_src = <4>;
+               datalb_chnum = <2>;
+               datalb-lane-mask-in = <0 1 0 0>;
                datalb_chmask = <0x3>;
 
                status = "okay";
@@ -1357,8 +1362,8 @@
        pdmin: pdmin {
                mux { /* gpioa_5, gpioa_6, gpioa_7, gpioa_8, gpioa_9*/
                        groups = "pdm_din0_a",
-                       /*"pdm_din1_a",*/
-                       "pdm_din2_a",
+                       "pdm_din1_a",
+                       /*"pdm_din2_a",*/
                        /*"pdm_din3_a",*/
                        "pdm_dclk_a";
                        function = "pdm";
@@ -1452,7 +1457,7 @@
        controller-type = <3>;
 };
 &ethmac {
-       status = "okay";
+       status = "disabled";
        pinctrl-names = "internal_eth_pins";
        pinctrl-0 = <&internal_eth_pins>;
        mc_val = <0x4be04>;

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_u202_1g.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_u202_1g.dts
index 89f10e6..5945980 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905d2_u202_1g.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_u202_1g.dts
@@ -580,7 +580,7 @@
                aml-audio-card,loopback = <&aml_loopback>;
                aml-audio-card,aux-devs = <&amlogic_codec>;
                /*avout mute gpio*/
-               avout_mute-gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>;
+               avout_mute-gpios = <&gpio_ao GPIOAO_8 GPIO_ACTIVE_HIGH>;
                /*for audio effect ,eqdrc */
                aml-audio-card,effect = <&audio_effect>;
 
@@ -667,7 +667,7 @@
                                system-clock-frequency = <12288000>;
                        };
                        codec {
-                               sound-dai = <&tlv320adc3101_32 &dummy_codec>;
+                               sound-dai = <&dummy_codec>;
                        };
                };
 
@@ -815,7 +815,7 @@
        cpufreq-meson {
                compatible = "amlogic, cpufreq-meson";
                pinctrl-names = "default";
-               pinctrl-0 = <&pwm_ao_d_pins3>;
+               /*pinctrl-0 = <&pwm_ao_d_pins3>;*/
                status = "okay";
        };
 
@@ -887,7 +887,8 @@
                #sound-dai-cells = <0>;
                reg = <0x31>;
                status = "okay";
-               reset_pin = <&gpio GPIOA_5 0>;
+               reset_pin = <&gpio_ao GPIOAO_9 0>;
+               enable_pin = <&gpio GPIOC_4 0>;
        };
 
        tlv320adc3101_32: tlv320adc3101_32@32 {
@@ -895,7 +896,7 @@
                #sound-dai-cells = <0>;
                reg = <0x19>;
                differential_pair = <1>;
-               status = "okay";
+               status = "disabled";
        };
 
        tas5707_36: tas5707_36@36 {
@@ -903,7 +904,7 @@
                #sound-dai-cells = <0>;
                reg = <0x1b>;
                status = "disabled";
-               reset_pin = <&gpio GPIOA_5 0>;
+       /*      reset_pin = <&gpio GPIOA_5 0>;*/
        };
 
        bl_extern_i2c {
@@ -1039,6 +1040,9 @@
                 */
                lb_mode = <0>;
 
+               clocks = <&clkc CLKID_MPLL2>;
+               clock-names = "datalb_mpll";
+
                /* datain src
                 * 0: tdmin_a;
                 * 1: tdmin_b;
@@ -1058,8 +1062,9 @@
                 * 4: PAD_tdminB
                 * 5: PAD_tdminC
                 */
-               datalb_src = <2>;
-               datalb_chnum = <8>;
+               datalb_src = <4>;
+               datalb_chnum = <2>;
+               datalb-lane-mask-in = <0 1 0 0>;
                datalb_chmask = <0x3>;
 
                status = "okay";
@@ -1201,8 +1206,8 @@
        pdmin: pdmin {
                mux { /* gpioa_5, gpioa_6, gpioa_7, gpioa_8, gpioa_9*/
                        groups = "pdm_din0_a",
-                       /*"pdm_din1_a",*/
-                       "pdm_din2_a",
+                       "pdm_din1_a",
+                       /*"pdm_din2_a",*/
                        /*"pdm_din3_a",*/
                        "pdm_dclk_a";
                        function = "pdm";
@@ -1296,7 +1301,7 @@
        controller-type = <3>;
 };
 &ethmac {
-       status = "okay";
+       status = "disabled";
        pinctrl-names = "internal_eth_pins";
        pinctrl-0 = <&internal_eth_pins>;
        mc_val = <0x4be04>;

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202.dts
index 0cf0177..3685f1f 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202.dts
@@ -575,7 +575,7 @@
                aml-audio-card,loopback = <&aml_loopback>;
                aml-audio-card,aux-devs = <&amlogic_codec>;
                /*avout mute gpio*/
-               avout_mute-gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>;
+               avout_mute-gpios = <&gpio_ao GPIOAO_8 GPIO_ACTIVE_HIGH>;
                /*for audio effect ,eqdrc */
                aml-audio-card,effect = <&audio_effect>;
 
@@ -662,7 +662,7 @@
                                system-clock-frequency = <12288000>;
                        };
                        codec {
-                               sound-dai = <&tlv320adc3101_32 &dummy_codec>;
+                               sound-dai = <&dummy_codec>;
                        };
                };
 
@@ -926,7 +926,7 @@
        cpufreq-meson {
                compatible = "amlogic, cpufreq-meson";
                pinctrl-names = "default";
-               pinctrl-0 = <&pwm_ao_d_pins3>;
+               /*pinctrl-0 = <&pwm_ao_d_pins3>;*/
                status = "okay";
        };
 
@@ -1042,7 +1042,8 @@
                #sound-dai-cells = <0>;
                reg = <0x31>;
                status = "okay";
-               reset_pin = <&gpio GPIOA_5 0>;
+               reset_pin = <&gpio_ao GPIOAO_9 0>;
+               enable_pin = <&gpio GPIOC_4 0>;
        };
 
        tlv320adc3101_32: tlv320adc3101_32@32 {
@@ -1050,7 +1051,7 @@
                #sound-dai-cells = <0>;
                reg = <0x19>;
                differential_pair = <1>;
-               status = "okay";
+               status = "disabled";
        };
 
        tas5707_36: tas5707_36@36 {
@@ -1058,7 +1059,7 @@
                #sound-dai-cells = <0>;
                reg = <0x1b>;
                status = "disabled";
-               reset_pin = <&gpio GPIOA_5 0>;
+       /*      reset_pin = <&gpio GPIOA_5 0>;*/
        };
 
        bl_extern_i2c {
@@ -1194,6 +1195,9 @@
                 */
                lb_mode = <0>;
 
+               clocks = <&clkc CLKID_MPLL2>;
+               clock-names = "datalb_mpll";
+
                /* datain src
                 * 0: tdmin_a;
                 * 1: tdmin_b;
@@ -1213,8 +1217,9 @@
                 * 4: PAD_tdminB
                 * 5: PAD_tdminC
                 */
-               datalb_src = <2>;
-               datalb_chnum = <8>;
+               datalb_src = <4>;
+               datalb_chnum = <2>;
+               datalb-lane-mask-in = <0 1 0 0>;
                datalb_chmask = <0x3>;
 
                status = "okay";
@@ -1356,8 +1361,8 @@
        pdmin: pdmin {
                mux { /* gpioa_5, gpioa_6, gpioa_7, gpioa_8, gpioa_9*/
                        groups = "pdm_din0_a",
-                       /*"pdm_din1_a",*/
-                       "pdm_din2_a",
+                       "pdm_din1_a",
+                       /*"pdm_din2_a",*/
                        /*"pdm_din3_a",*/
                        "pdm_dclk_a";
                        function = "pdm";
@@ -1451,7 +1456,7 @@
        controller-type = <3>;
 };
 &ethmac {
-       status = "okay";
+       status = "disabled";
        pinctrl-names = "internal_eth_pins";
        pinctrl-0 = <&internal_eth_pins>;
        mc_val = <0x4be04>;

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202_1g.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202_1g.dts
index 84d3d5b..e3290f9 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202_1g.dts
@@ -574,7 +574,7 @@
                aml-audio-card,loopback = <&aml_loopback>;
                aml-audio-card,aux-devs = <&amlogic_codec>;
                /*avout mute gpio*/
-               avout_mute-gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>;
+               avout_mute-gpios = <&gpio_ao GPIOAO_8 GPIO_ACTIVE_HIGH>;
                /*for audio effect ,eqdrc */
                aml-audio-card,effect = <&audio_effect>;
 
@@ -661,7 +661,7 @@
                                system-clock-frequency = <12288000>;
                        };
                        codec {
-                               sound-dai = <&tlv320adc3101_32 &dummy_codec>;
+                               sound-dai = <&dummy_codec>;
                        };
                };
 
@@ -809,7 +809,7 @@
        cpufreq-meson {
                compatible = "amlogic, cpufreq-meson";
                pinctrl-names = "default";
-               pinctrl-0 = <&pwm_ao_d_pins3>;
+               /*pinctrl-0 = <&pwm_ao_d_pins3>;*/
                status = "okay";
        };
 
@@ -881,7 +881,8 @@
                #sound-dai-cells = <0>;
                reg = <0x31>;
                status = "okay";
-               reset_pin = <&gpio GPIOA_5 0>;
+               reset_pin = <&gpio_ao GPIOAO_9 0>;
+               enable_pin = <&gpio GPIOC_4 0>;
        };
 
        tlv320adc3101_32: tlv320adc3101_32@32 {
@@ -889,7 +890,7 @@
                #sound-dai-cells = <0>;
                reg = <0x19>;
                differential_pair = <1>;
-               status = "okay";
+               status = "disabled";
        };
 
        tas5707_36: tas5707_36@36 {
@@ -897,7 +898,7 @@
                #sound-dai-cells = <0>;
                reg = <0x1b>;
                status = "disabled";
-               reset_pin = <&gpio GPIOA_5 0>;
+       /*      reset_pin = <&gpio GPIOA_5 0>;*/
        };
 
        bl_extern_i2c {
@@ -1033,6 +1034,9 @@
                 */
                lb_mode = <0>;
 
+               clocks = <&clkc CLKID_MPLL2>;
+               clock-names = "datalb_mpll";
+
                /* datain src
                 * 0: tdmin_a;
                 * 1: tdmin_b;
@@ -1052,8 +1056,9 @@
                 * 4: PAD_tdminB
                 * 5: PAD_tdminC
                 */
-               datalb_src = <2>;
-               datalb_chnum = <8>;
+               datalb_src = <4>;
+               datalb_chnum = <2>;
+               datalb-lane-mask-in = <0 1 0 0>;
                datalb_chmask = <0x3>;
 
                status = "okay";
@@ -1195,8 +1200,8 @@
        pdmin: pdmin {
                mux { /* gpioa_5, gpioa_6, gpioa_7, gpioa_8, gpioa_9*/
                        groups = "pdm_din0_a",
-                       /*"pdm_din1_a",*/
-                       "pdm_din2_a",
+                       "pdm_din1_a",
+                       /*"pdm_din2_a",*/
                        /*"pdm_din3_a",*/
                        "pdm_dclk_a";
                        function = "pdm";
@@ -1290,7 +1295,7 @@
        controller-type = <3>;
 };
 &ethmac {
-       status = "okay";
+       status = "disabled";
        pinctrl-names = "internal_eth_pins";
        pinctrl-0 = <&internal_eth_pins>;
        mc_val = <0x4be04>;