From c748be2be1083210a1583fd8de54d7d65eea417d Mon Sep 17 00:00:00 2001 From: Shuai Li Date: Sat, 2 Nov 2019 03:41:47 +0800 Subject: [PATCH] audio: wrong mclk_pad setting for TL1 [1/1] PD#SWPL-16108 Problem: Mclk_pad is set 0 by all three TDM module. The result is that only the last one takes effect. Solution: Modify the mclk_pad setting and delete the unused one. Verify: TL1. Change-Id: I2fa881e8ebcc2e7822dfbbea6a7ac0bfbc8ae0f9 Signed-off-by: Shuai Li --- arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts | 4 +--- arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts | 4 +--- arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g.dts | 4 +--- arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts | 4 +--- arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g.dts | 4 +--- arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts | 4 +--- arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.dts | 4 +--- arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g.dts | 4 +--- arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts | 4 +--- arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g.dts | 4 +--- arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts | 4 +--- 11 files changed, 11 insertions(+), 33 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts index 93309e6..8c5313e 100644 --- a/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts +++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_skt.dts @@ -1315,7 +1315,7 @@ &clkc CLKID_MPLL1>; clock-names = "mclk", "clk_srcpll"; - mclk_pad = <0>; /* 0: mclk_0; 1: mclk_1 */ + mclk_pad = <1>; /* 0: mclk_0; 1: mclk_1 */ status = "okay"; }; @@ -1335,8 +1335,6 @@ pinctrl-names = "tdm_pins"; pinctrl-0 = <&tdmout_c &tdmin_c>; - mclk_pad = <0>; /* 0: mclk_0; 1: mclk_1 */ - status = "okay"; }; diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts index f1af7f5..c5b3e83 100644 --- a/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts +++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_t309.dts @@ -1347,7 +1347,7 @@ &clkc CLKID_MPLL1>; clock-names = "mclk", "clk_srcpll"; - mclk_pad = <0>; /* 0: mclk_0; 1: mclk_1 */ + mclk_pad = <1>; /* 0: mclk_0; 1: mclk_1 */ status = "okay"; }; @@ -1367,8 +1367,6 @@ pinctrl-names = "tdm_pins"; pinctrl-0 = <&tdmout_c &tdmin_c>; - mclk_pad = <0>; /* 0: mclk_0; 1: mclk_1 */ - status = "okay"; }; diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g.dts index 6667d06..eb459a9 100644 --- a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g.dts +++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g.dts @@ -1447,7 +1447,7 @@ &clkc CLKID_MPLL1>; clock-names = "mclk", "clk_srcpll"; - mclk_pad = <0>; /* 0: mclk_0; 1: mclk_1 */ + mclk_pad = <1>; /* 0: mclk_0; 1: mclk_1 */ status = "okay"; }; @@ -1467,8 +1467,6 @@ pinctrl-names = "tdm_pins"; pinctrl-0 = <&tdmout_c &tdmin_c>; - mclk_pad = <0>; /* 0: mclk_0; 1: mclk_1 */ - status = "okay"; }; diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts index 1f67f15..2c7a8d9 100644 --- a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts +++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts @@ -1436,7 +1436,7 @@ &clkc CLKID_MPLL1>; clock-names = "mclk", "clk_srcpll"; - mclk_pad = <0>; /* 0: mclk_0; 1: mclk_1 */ + mclk_pad = <1>; /* 0: mclk_0; 1: mclk_1 */ status = "okay"; }; @@ -1456,8 +1456,6 @@ pinctrl-names = "tdm_pins"; pinctrl-0 = <&tdmout_c &tdmin_c>; - mclk_pad = <0>; /* 0: mclk_0; 1: mclk_1 */ - status = "okay"; }; diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g.dts index 50d8510..396f058 100644 --- a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g.dts +++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g.dts @@ -1441,7 +1441,7 @@ &clkc CLKID_MPLL1>; clock-names = "mclk", "clk_srcpll"; - mclk_pad = <0>; /* 0: mclk_0; 1: mclk_1 */ + mclk_pad = <1>; /* 0: mclk_0; 1: mclk_1 */ status = "okay"; }; @@ -1461,8 +1461,6 @@ pinctrl-names = "tdm_pins"; pinctrl-0 = <&tdmout_c &tdmin_c>; - mclk_pad = <0>; /* 0: mclk_0; 1: mclk_1 */ - status = "okay"; }; diff --git a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts index 1c0d406..857ee5e 100644 --- a/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts +++ b/arch/arm/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts @@ -1430,7 +1430,7 @@ &clkc CLKID_MPLL1>; clock-names = "mclk", "clk_srcpll"; - mclk_pad = <0>; /* 0: mclk_0; 1: mclk_1 */ + mclk_pad = <1>; /* 0: mclk_0; 1: mclk_1 */ status = "okay"; }; @@ -1450,8 +1450,6 @@ pinctrl-names = "tdm_pins"; pinctrl-0 = <&tdmout_c &tdmin_c>; - mclk_pad = <0>; /* 0: mclk_0; 1: mclk_1 */ - status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.dts b/arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.dts index 39eb384..015ff8c 100644 --- a/arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.dts +++ b/arch/arm64/boot/dts/amlogic/tl1_t962x2_t309.dts @@ -1345,7 +1345,7 @@ &clkc CLKID_MPLL1>; clock-names = "mclk", "clk_srcpll"; - mclk_pad = <0>; /* 0: mclk_0; 1: mclk_1 */ + mclk_pad = <1>; /* 0: mclk_0; 1: mclk_1 */ status = "okay"; }; @@ -1365,8 +1365,6 @@ pinctrl-names = "tdm_pins"; pinctrl-0 = <&tdmout_c &tdmin_c>; - mclk_pad = <0>; /* 0: mclk_0; 1: mclk_1 */ - status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g.dts b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g.dts index 3d10d74..e55fdb0 100644 --- a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g.dts +++ b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g.dts @@ -1444,7 +1444,7 @@ &clkc CLKID_MPLL1>; clock-names = "mclk", "clk_srcpll"; - mclk_pad = <0>; /* 0: mclk_0; 1: mclk_1 */ + mclk_pad = <1>; /* 0: mclk_0; 1: mclk_1 */ status = "okay"; }; @@ -1464,8 +1464,6 @@ pinctrl-names = "tdm_pins"; pinctrl-0 = <&tdmout_c &tdmin_c>; - mclk_pad = <0>; /* 0: mclk_0; 1: mclk_1 */ - status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts index aaf44d7..6078bc8 100644 --- a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts +++ b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_1g_drm.dts @@ -1431,7 +1431,7 @@ &clkc CLKID_MPLL1>; clock-names = "mclk", "clk_srcpll"; - mclk_pad = <0>; /* 0: mclk_0; 1: mclk_1 */ + mclk_pad = <1>; /* 0: mclk_0; 1: mclk_1 */ status = "okay"; }; @@ -1451,8 +1451,6 @@ pinctrl-names = "tdm_pins"; pinctrl-0 = <&tdmout_c &tdmin_c>; - mclk_pad = <0>; /* 0: mclk_0; 1: mclk_1 */ - status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g.dts b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g.dts index 1478a4e..61af065 100644 --- a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g.dts +++ b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g.dts @@ -1436,7 +1436,7 @@ &clkc CLKID_MPLL1>; clock-names = "mclk", "clk_srcpll"; - mclk_pad = <0>; /* 0: mclk_0; 1: mclk_1 */ + mclk_pad = <1>; /* 0: mclk_0; 1: mclk_1 */ status = "okay"; }; @@ -1456,8 +1456,6 @@ pinctrl-names = "tdm_pins"; pinctrl-0 = <&tdmout_c &tdmin_c>; - mclk_pad = <0>; /* 0: mclk_0; 1: mclk_1 */ - status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts index 6af48a5..32a6f88 100644 --- a/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts +++ b/arch/arm64/boot/dts/amlogic/tl1_t962x2_x301_2g_drm.dts @@ -1423,7 +1423,7 @@ &clkc CLKID_MPLL1>; clock-names = "mclk", "clk_srcpll"; - mclk_pad = <0>; /* 0: mclk_0; 1: mclk_1 */ + mclk_pad = <1>; /* 0: mclk_0; 1: mclk_1 */ status = "okay"; }; @@ -1443,8 +1443,6 @@ pinctrl-names = "tdm_pins"; pinctrl-0 = <&tdmout_c &tdmin_c>; - mclk_pad = <0>; /* 0: mclk_0; 1: mclk_1 */ - status = "okay"; }; -- 2.7.4