From 47408422ea9f45c997a39ec19662189d6a2e108a Mon Sep 17 00:00:00 2001 From: Shuai Li Date: Fri, 6 Sep 2019 16:26:02 +0800 Subject: [PATCH] audio: mclk pad0 doesn't output clk [1/1] PD#OTT-5603 Problem: Configurate GPIO_AO 9 as mclk_0,it doesn't work. Solution: From SM1, the mclk pad register is changed. Using standard clk tree to make it compitable. Verify: TM2, SM1. Change-Id: I8d53296297536c90768495232570f33fc89db131 Signed-off-by: Shuai Li --- arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts | 3 ++- arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts | 3 ++- arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts | 3 ++- arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts | 3 ++- arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts | 3 ++- arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts | 3 ++- arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts | 3 ++- arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts | 3 ++- arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts | 3 ++- arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts | 3 ++- include/dt-bindings/clock/amlogic,sm1-audio-clk.h | 5 ++++- include/dt-bindings/clock/amlogic,tm2-audio-clk.h | 5 ++++- 12 files changed, 28 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts index 3488f08267ce..3275d1975bbd 100644 --- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts +++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts @@ -1104,10 +1104,11 @@ //dai-tdm-lane-slot-mask-out = <1 1 1 1 1 1 1 1>; dai-tdm-clk-sel = <1>; clocks = <&clkaudio CLKID_AUDIO_MCLK_B + &clkaudio CLKID_AUDIO_MCLK_PAD0 &clkc CLKID_MPLL1 &clkc CLKID_MPLL0 &clkaudio CLKID_AUDIO_SPDIFOUT_A>; - clock-names = "mclk", "clk_srcpll", + clock-names = "mclk", "mclk_pad", "clk_srcpll", "samesource_srcpll", "samesource_clk"; pinctrl-names = "tdm_pins"; pinctrl-0 = <&tdmb_mclk &tdmout_b &tdmin_b>; diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts index 4b5a93b1b83a..e6749f9ea523 100644 --- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts +++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts @@ -1152,10 +1152,11 @@ //dai-tdm-lane-slot-mask-out = <1 1 1 1 1 1 1 1>; dai-tdm-clk-sel = <1>; clocks = <&clkaudio CLKID_AUDIO_MCLK_B + &clkaudio CLKID_AUDIO_MCLK_PAD0 &clkc CLKID_MPLL1 &clkc CLKID_MPLL0 &clkaudio CLKID_AUDIO_SPDIFOUT_A>; - clock-names = "mclk", "clk_srcpll", + clock-names = "mclk", "mclk_pad", "clk_srcpll", "samesource_srcpll", "samesource_clk"; pinctrl-names = "tdm_pins"; /*pinctrl-0 = <&tdmb_mclk &tdmout_b &tdmin_b>;*/ 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 d4b86c80e4bd..1683e0347538 100644 --- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts +++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts @@ -1150,10 +1150,11 @@ //dai-tdm-lane-slot-mask-out = <1 1 1 1 1 1 1 1>; dai-tdm-clk-sel = <1>; clocks = <&clkaudio CLKID_AUDIO_MCLK_B + &clkaudio CLKID_AUDIO_MCLK_PAD0 &clkc CLKID_MPLL1 &clkc CLKID_MPLL0 &clkaudio CLKID_AUDIO_SPDIFOUT_A>; - clock-names = "mclk", "clk_srcpll", + clock-names = "mclk", "mclk_pad", "clk_srcpll", "samesource_srcpll", "samesource_clk"; pinctrl-names = "tdm_pins"; /*pinctrl-0 = <&tdmb_mclk &tdmout_b &tdmin_b>;*/ diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts index 1b10b06874f2..2d4c06f86423 100644 --- a/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts +++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts @@ -1102,10 +1102,11 @@ dai-tdm-lane-slot-mask-out = <1 0 0 0>; dai-tdm-clk-sel = <1>; clocks = <&clkaudio CLKID_AUDIO_MCLK_B + &clkaudio CLKID_AUDIO_MCLK_PAD0 &clkc CLKID_MPLL1 &clkc CLKID_MPLL0 &clkaudio CLKID_AUDIO_SPDIFOUT_A>; - clock-names = "mclk", "clk_srcpll", + clock-names = "mclk", "mclk_pad", "clk_srcpll", "samesource_srcpll", "samesource_clk"; pinctrl-names = "tdm_pins"; pinctrl-0 = <&tdmb_mclk &tdmout_b &tdmin_b>; diff --git a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts index 85dcbf28c0f6..d099c3faaf97 100644 --- a/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts +++ b/arch/arm/boot/dts/amlogic/sm1_s905x3_ac213.dts @@ -1098,10 +1098,11 @@ dai-tdm-lane-slot-mask-out = <1 0 0 0>; dai-tdm-clk-sel = <1>; clocks = <&clkaudio CLKID_AUDIO_MCLK_B + &clkaudio CLKID_AUDIO_MCLK_PAD0 &clkc CLKID_MPLL1 &clkc CLKID_MPLL0 &clkaudio CLKID_AUDIO_SPDIFOUT_A>; - clock-names = "mclk", "clk_srcpll", + clock-names = "mclk", "mclk_pad", "clk_srcpll", "samesource_srcpll", "samesource_clk"; pinctrl-names = "tdm_pins"; pinctrl-0 = <&tdmb_mclk &tdmout_b &tdmin_b>; diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts index 6e784baf3fb1..d68ebc56fafd 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts @@ -1104,10 +1104,11 @@ dai-tdm-lane-slot-mask-out = <1 0 0 0>; dai-tdm-clk-sel = <1>; clocks = <&clkaudio CLKID_AUDIO_MCLK_B + &clkaudio CLKID_AUDIO_MCLK_PAD0 &clkc CLKID_MPLL1 &clkc CLKID_MPLL0 &clkaudio CLKID_AUDIO_SPDIFOUT_A>; - clock-names = "mclk", "clk_srcpll", + clock-names = "mclk", "mclk_pad", "clk_srcpll", "samesource_srcpll", "samesource_clk"; pinctrl-names = "tdm_pins"; pinctrl-0 = <&tdmb_mclk &tdmout_b &tdmin_b>; diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts index 1b05cc910985..cbf4c38caa80 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts @@ -1149,10 +1149,11 @@ //dai-tdm-lane-slot-mask-out = <1 1 1 1 1 1 1 1>; dai-tdm-clk-sel = <1>; clocks = <&clkaudio CLKID_AUDIO_MCLK_B + &clkaudio CLKID_AUDIO_MCLK_PAD0 &clkc CLKID_MPLL1 &clkc CLKID_MPLL0 &clkaudio CLKID_AUDIO_SPDIFOUT_A>; - clock-names = "mclk", "clk_srcpll", + clock-names = "mclk", "mclk_pad", "clk_srcpll", "samesource_srcpll", "samesource_clk"; pinctrl-names = "tdm_pins"; /*pinctrl-0 = <&tdmb_mclk &tdmout_b &tdmin_b>;*/ 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 801b0194ee71..1a08aac1df00 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts @@ -1149,10 +1149,11 @@ //dai-tdm-lane-slot-mask-out = <1 1 1 1 1 1 1 1>; dai-tdm-clk-sel = <1>; clocks = <&clkaudio CLKID_AUDIO_MCLK_B + &clkaudio CLKID_AUDIO_MCLK_PAD0 &clkc CLKID_MPLL1 &clkc CLKID_MPLL0 &clkaudio CLKID_AUDIO_SPDIFOUT_A>; - clock-names = "mclk", "clk_srcpll", + clock-names = "mclk", "mclk_pad", "clk_srcpll", "samesource_srcpll", "samesource_clk"; pinctrl-names = "tdm_pins"; /*pinctrl-0 = <&tdmb_mclk &tdmout_b &tdmin_b>;*/ diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts index 466a95e4d687..463b9ea7a658 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts @@ -1100,10 +1100,11 @@ dai-tdm-lane-slot-mask-out = <1 0 0 0>; dai-tdm-clk-sel = <1>; clocks = <&clkaudio CLKID_AUDIO_MCLK_B + &clkaudio CLKID_AUDIO_MCLK_PAD0 &clkc CLKID_MPLL1 &clkc CLKID_MPLL0 &clkaudio CLKID_AUDIO_SPDIFOUT_A>; - clock-names = "mclk", "clk_srcpll", + clock-names = "mclk", "mclk_pad", "clk_srcpll", "samesource_srcpll", "samesource_clk"; pinctrl-names = "tdm_pins"; pinctrl-0 = <&tdmb_mclk &tdmout_b &tdmin_b>; diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts index ea12cf95bb62..8ae7ce4517c4 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts @@ -1175,10 +1175,11 @@ dai-tdm-lane-slot-mask-out = <1 0 0 0>; dai-tdm-clk-sel = <1>; clocks = <&clkaudio CLKID_AUDIO_MCLK_B + &clkaudio CLKID_AUDIO_MCLK_PAD0 &clkc CLKID_MPLL1 &clkc CLKID_MPLL0 &clkaudio CLKID_AUDIO_SPDIFOUT_A>; - clock-names = "mclk", "clk_srcpll", + clock-names = "mclk", "mclk_pad", "clk_srcpll", "samesource_srcpll", "samesource_clk"; pinctrl-names = "tdm_pins"; pinctrl-0 = <&tdmb_mclk &tdmout_b &tdmin_b>; diff --git a/include/dt-bindings/clock/amlogic,sm1-audio-clk.h b/include/dt-bindings/clock/amlogic,sm1-audio-clk.h index 9ec20b6116f1..e745f64097ea 100644 --- a/include/dt-bindings/clock/amlogic,sm1-audio-clk.h +++ b/include/dt-bindings/clock/amlogic,sm1-audio-clk.h @@ -88,5 +88,8 @@ #define CLKID_EARCRX_CMDC (MCLK_BASE + 20) #define CLKID_EARCRX_DMAC (MCLK_BASE + 21) -#define NUM_AUDIO_CLKS (MCLK_BASE + 22) +#define CLKID_AUDIO_MCLK_PAD0 (MCLK_BASE + 22) +#define CLKID_AUDIO_MCLK_PAD1 (MCLK_BASE + 23) + +#define NUM_AUDIO_CLKS (MCLK_BASE + 24) #endif /* __SM1_AUDIO_CLK_H__ */ diff --git a/include/dt-bindings/clock/amlogic,tm2-audio-clk.h b/include/dt-bindings/clock/amlogic,tm2-audio-clk.h index a70cf1ef636b..458ca722d5b3 100644 --- a/include/dt-bindings/clock/amlogic,tm2-audio-clk.h +++ b/include/dt-bindings/clock/amlogic,tm2-audio-clk.h @@ -93,5 +93,8 @@ #define CLKID_EARCRX_CMDC (MCLK_BASE + 20) #define CLKID_EARCRX_DMAC (MCLK_BASE + 21) -#define NUM_AUDIO_CLKS (MCLK_BASE + 22) +#define CLKID_AUDIO_MCLK_PAD0 (MCLK_BASE + 22) +#define CLKID_AUDIO_MCLK_PAD1 (MCLK_BASE + 23) + +#define NUM_AUDIO_CLKS (MCLK_BASE + 24) #endif /* __TM2_AUDIO_CLK_H__ */