Skip to contentSkip to conversation

refine the ssi clock for imx6sl, and update dts file.

PATCH Applied Shengjiu Wang 3 participants 10 messages Sep 9, 2014 – Sep 15, 2014

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

cover refine the ssi clock for imx6sl, and update dts file.

This serial patch is for refining the ssi clock tree for imx6sl, and update imx6qdl and imx6sl dts file.

Shengjiu Wang (3):
ARM: clk-imx6sl: refine clock tree for SSI
ARM: dts: imx6qdl: add baud clock and clock-names for ssi
ARM: dts: imx6sl: add baud clock and clock-names for ssi

 arch/arm/boot/dts/imx6qdl.dtsi           |   12 +++++++++---
 arch/arm/boot/dts/imx6sl.dtsi            |   12 +++++++++---
 arch/arm/mach-imx/clk-imx6sl.c           |   13 ++++++++++---
 include/dt-bindings/clock/imx6sl-clock.h |    5 ++++-
 4 files changed, 32 insertions(+), 10 deletions(-)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/3 ARM: clk-imx6sl: refine clock tree for SSI

Each SSI has "ssi", "ssi_ipg" clocks, and they share same gate bits.

---
 arch/arm/mach-imx/clk-imx6sl.c           |   13 ++++++++++---
 include/dt-bindings/clock/imx6sl-clock.h |    5 ++++-
 2 files changed, 14 insertions(+), 4 deletions(-)
arch/arm/mach-imx/clk-imx6sl.c +10 -3
index 6791ff3..c8de87b 100644
@@ -95,6 +95,10 @@ static struct clk_div_table video_div_table[] = {
 	{ }
 };
 
+static unsigned int share_count_ssi1;
+static unsigned int share_count_ssi2;
+static unsigned int share_count_ssi3;
+
 static struct clk *clks[IMX6SL_CLK_END];
 static struct clk_onecell_data clk_data;
 static void __iomem *ccm_base;
@@ -392,9 +396,12 @@ static void __init imx6sl_clocks_init(struct device_node *ccm_node)
 	clks[IMX6SL_CLK_SDMA]         = imx_clk_gate2("sdma",         "ipg",               base + 0x7c, 6);
 	clks[IMX6SL_CLK_SPBA]         = imx_clk_gate2("spba",         "ipg",               base + 0x7c, 12);
 	clks[IMX6SL_CLK_SPDIF]        = imx_clk_gate2("spdif",        "spdif0_podf",       base + 0x7c, 14);
-	clks[IMX6SL_CLK_SSI1]         = imx_clk_gate2("ssi1",         "ssi1_podf",         base + 0x7c, 18);
-	clks[IMX6SL_CLK_SSI2]         = imx_clk_gate2("ssi2",         "ssi2_podf",         base + 0x7c, 20);
-	clks[IMX6SL_CLK_SSI3]         = imx_clk_gate2("ssi3",         "ssi3_podf",         base + 0x7c, 22);
+	clks[IMX6SL_CLK_SSI1_IPG]     = imx_clk_gate2_shared("ssi1_ipg",     "ipg",        base + 0x7c, 18, &share_count_ssi1);
+	clks[IMX6SL_CLK_SSI2_IPG]     = imx_clk_gate2_shared("ssi2_ipg",     "ipg",        base + 0x7c, 20, &share_count_ssi2);
+	clks[IMX6SL_CLK_SSI3_IPG]     = imx_clk_gate2_shared("ssi3_ipg",     "ipg",        base + 0x7c, 22, &share_count_ssi3);
+	clks[IMX6SL_CLK_SSI1]         = imx_clk_gate2_shared("ssi1",         "ssi1_podf",  base + 0x7c, 18, &share_count_ssi1);
+	clks[IMX6SL_CLK_SSI2]         = imx_clk_gate2_shared("ssi2",         "ssi2_podf",  base + 0x7c, 20, &share_count_ssi2);
+	clks[IMX6SL_CLK_SSI3]         = imx_clk_gate2_shared("ssi3",         "ssi3_podf",  base + 0x7c, 22, &share_count_ssi3);
 	clks[IMX6SL_CLK_UART]         = imx_clk_gate2("uart",         "ipg",               base + 0x7c, 24);
 	clks[IMX6SL_CLK_UART_SERIAL]  = imx_clk_gate2("uart_serial",  "uart_root",         base + 0x7c, 26);
 	clks[IMX6SL_CLK_USBOH3]       = imx_clk_gate2("usboh3",       "ipg",               base + 0x80, 0);
include/dt-bindings/clock/imx6sl-clock.h +4 -1
index f10a928..9ce4e42 100644
@@ -171,6 +171,9 @@
 #define IMX6SL_PLL5_BYPASS		158
 #define IMX6SL_PLL6_BYPASS		159
 #define IMX6SL_PLL7_BYPASS		160
-#define IMX6SL_CLK_END			161
+#define IMX6SL_CLK_SSI1_IPG		161
+#define IMX6SL_CLK_SSI2_IPG		162
+#define IMX6SL_CLK_SSI3_IPG		163
+#define IMX6SL_CLK_END			164
 
 #endif /* __DT_BINDINGS_CLOCK_IMX6SL_H */
Signature · 1 line
1.7.9.5
reviewer
#2 lore raw

Re: [PATCH V1 1/3] ARM: clk-imx6sl: refine clock tree for SSI

Quoted 3 lines · Shengjiu Wang

Each SSI has "ssi", "ssi_ipg" clocks, and they share same gate bits.

This patch breaks audio playback on imx6q-sabresd:

root at freescale /$ aplay /home/clarinet.wav
Playing WAVE '/home/clarinet.wav' : Signed 16 bit Little Endian, Rate 44100 Hz, Mono
underrun!!! (at least -1585992.581 ms long)
underrun!!! (at least -1585992.585 ms long)
underrun!!! (at least -1585992.586 ms long)
underrun!!! (at least -1585992.586 ms long)
underrun!!! (at least -1585992.586 ms long)
underrun!!! (at least -1585992.586 ms long)
underrun!!! (at least -1585992.586 ms long)
underrun!!! (at least -1585992.586 ms long)
underrun!!! (at least -1585992.586 ms long)
underrun!!! (at least -1585992.586 ms long)

If I revert this commit, then I am able to play it well again.

reviewer
#3 lore raw

Re: [PATCH V1 1/3] ARM: clk-imx6sl: refine clock tree for SSI

Quoted 22 lines · Fabio Estevam
Quoted 3 lines · Shengjiu Wang

Each SSI has "ssi", "ssi_ipg" clocks, and they share same gate bits.

This patch breaks audio playback on imx6q-sabresd:

root at freescale /$ aplay /home/clarinet.wav
Playing WAVE '/home/clarinet.wav' : Signed 16 bit Little Endian, Rate 44100 Hz, Mono
underrun!!! (at least -1585992.581 ms long)
underrun!!! (at least -1585992.585 ms long)
underrun!!! (at least -1585992.586 ms long)
underrun!!! (at least -1585992.586 ms long)
underrun!!! (at least -1585992.586 ms long)
underrun!!! (at least -1585992.586 ms long)
underrun!!! (at least -1585992.586 ms long)
underrun!!! (at least -1585992.586 ms long)
underrun!!! (at least -1585992.586 ms long)
underrun!!! (at least -1585992.586 ms long)

Quoted 1 line

If I revert this commit, then I am able to play it well again.

Ops, I replied in the wrong patch.

The one that breaks imx6q-sabresd is:

commit 48e1c2255 "ARM: clk-imx6q: refine clock tree for SSI"

#4 lore raw

Re: [PATCH V1 1/3] ARM: clk-imx6sl: refine clock tree for SSI

Hi fabio, shawn.

Quoted 23 lines · Fabio Estevam
Quoted 22 lines · Fabio Estevam
Quoted 3 lines · Shengjiu Wang

Each SSI has "ssi", "ssi_ipg" clocks, and they share same gate bits.

This patch breaks audio playback on imx6q-sabresd:

root at freescale /$ aplay /home/clarinet.wav
Playing WAVE '/home/clarinet.wav' : Signed 16 bit Little Endian, Rate 44100 Hz, Mono
underrun!!! (at least -1585992.581 ms long)
underrun!!! (at least -1585992.585 ms long)
underrun!!! (at least -1585992.586 ms long)
underrun!!! (at least -1585992.586 ms long)
underrun!!! (at least -1585992.586 ms long)
underrun!!! (at least -1585992.586 ms long)
underrun!!! (at least -1585992.586 ms long)
underrun!!! (at least -1585992.586 ms long)
underrun!!! (at least -1585992.586 ms long)
underrun!!! (at least -1585992.586 ms long)

Quoted 7 lines
Quoted 1 line

If I revert this commit, then I am able to play it well again.

Ops, I replied in the wrong patch.

The one that breaks imx6q-sabresd is:

commit 48e1c2255 "ARM: clk-imx6q: refine clock tree for SSI"

I add IMX6QDL_CLK_SSIx in this patch, which use share count with IMX6QDL_CLK_SSIx_IPG. The SSI driver sound/soc/fsl/fsl_ssi.c will enable IMX6QDL_CLK_SSIx_IPG clock in probe, but don't disable it. In the end of kernel boot up, some one(it is not ssi driver, maybe is the clock tree) will disable the IMX6QDL_CLK_SSIx clock, which is not enabled. IMX6QDL_CLK_SSIx_IPG share the enable/disable bit with IMX6QDL_CLK_SSIx, So IMX6QDL_CLK_SSIx_IPG is disabled, the aplay will fail.

Is this the issue of imx_clk_gate2_shared()? When we want to disable IMX6QDL_CLK_SSIx, but IMX6QDL_CLK_SSIx_IPG is enabled, can IMX6QDL_CLK_SSIx be disabled?

Shawn

How do you think about this?

best regards
wang shengjiu

#5 lore raw

Re: [PATCH V1 1/3] ARM: clk-imx6sl: refine clock tree for SSI

Quoted 8 lines · Shengjiu Wang

I add IMX6QDL_CLK_SSIx in this patch, which use share count with IMX6QDL_CLK_SSIx_IPG. The SSI driver sound/soc/fsl/fsl_ssi.c will enable IMX6QDL_CLK_SSIx_IPG clock in probe, but don't disable it. In the end of kernel boot up, some one(it is not ssi driver, maybe is the clock tree) will disable the IMX6QDL_CLK_SSIx clock, which is not enabled. IMX6QDL_CLK_SSIx_IPG share the enable/disable bit with IMX6QDL_CLK_SSIx, So IMX6QDL_CLK_SSIx_IPG is disabled, the aplay will fail.

Quoted 7 lines

Is this the issue of imx_clk_gate2_shared()? When we want to disable IMX6QDL_CLK_SSIx, but IMX6QDL_CLK_SSIx_IPG is enabled, can IMX6QDL_CLK_SSIx be disabled?

Shawn

How do you think about this?

Shengjiu,

Your analysis is right. I hope the following change will get the shared gate clock code eventually does the right thing.

Shawn

arch/arm/mach-imx/clk-gate2.c +1 -1
index 84acdfd1d715..89abdf738dc9 100644
@@ -97,7 +97,7 @@ static int clk_gate2_is_enabled(struct clk_hw *hw)
        struct clk_gate2 *gate = to_clk_gate2(hw);
 
        if (gate->share_count)
-               return !!(*gate->share_count);
+               return !!__clk_get_enable_count(hw->clk);
        else
                return clk_gate2_reg_is_enabled(gate->reg, gate->bit_idx);
 }
reviewer Tested-by
#6 lore raw

Re: [PATCH V1 1/3] ARM: clk-imx6sl: refine clock tree for SSI

Quoted 12 lines · Shawn Guo

Shengjiu,

Your analysis is right. I hope the following change will get the shared gate clock code eventually does the right thing.

Shawn

arch/arm/mach-imx/clk-gate2.c +0 -0
index 84acdfd1d715..89abdf738dc9 100644

arch/arm/mach-imx/clk-gate2.c static int clk_gate2_is_enabled(struct clk_hw *hw) · line 102

Quoted 7 lines
arch/arm/mach-imx/clk-gate2.c +1 -1
@@ -97,7 +97,7 @@ static int clk_gate2_is_enabled(struct clk_hw *hw)
        struct clk_gate2 *gate = to_clk_gate2(hw);
 
        if (gate->share_count)
-               return !!(*gate->share_count);
+               return !!__clk_get_enable_count(hw->clk);
        else
                return clk_gate2_reg_is_enabled(gate->reg, gate->bit_idx);

This fixes the audio playback, thanks. Tested on a mx6qsabresd and also on mx6sx sdb:

#7 lore raw

PATCH 2/3 ARM: dts: imx6qdl: add baud clock and clock-names for ssi

In reply to Shengjiu Wang

Baud clock is used for bit clock generation in master mode. Ipg clock is peripheral clock and peripheral access clock.

---
 arch/arm/boot/dts/imx6qdl.dtsi |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
arch/arm/boot/dts/imx6qdl.dtsi +9 -3
index 70d7207..0de8806 100644
@@ -280,7 +280,9 @@
 							"fsl,imx51-ssi";
 					reg = <0x02028000 0x4000>;
 					interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>;
-					clocks = <&clks IMX6QDL_CLK_SSI1_IPG>;
+					clocks = <&clks IMX6QDL_CLK_SSI1_IPG>,
+						 <&clks IMX6QDL_CLK_SSI1>;
+					clock-names = "ipg", "baud";
 					dmas = <&sdma 37 1 0>,
 					       <&sdma 38 1 0>;
 					dma-names = "rx", "tx";
@@ -294,7 +296,9 @@
 							"fsl,imx51-ssi";
 					reg = <0x0202c000 0x4000>;
 					interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;
-					clocks = <&clks IMX6QDL_CLK_SSI2_IPG>;
+					clocks = <&clks IMX6QDL_CLK_SSI2_IPG>,
+						 <&clks IMX6QDL_CLK_SSI2>;
+					clock-names = "ipg", "baud";
 					dmas = <&sdma 41 1 0>,
 					       <&sdma 42 1 0>;
 					dma-names = "rx", "tx";
@@ -308,7 +312,9 @@
 							"fsl,imx51-ssi";
 					reg = <0x02030000 0x4000>;
 					interrupts = <0 48 IRQ_TYPE_LEVEL_HIGH>;
-					clocks = <&clks IMX6QDL_CLK_SSI3_IPG>;
+					clocks = <&clks IMX6QDL_CLK_SSI3_IPG>,
+						 <&clks IMX6QDL_CLK_SSI3>;
+					clock-names = "ipg", "baud";
 					dmas = <&sdma 45 1 0>,
 					       <&sdma 46 1 0>;
 					dma-names = "rx", "tx";
Signature · 1 line
1.7.9.5
#8 lore raw

PATCH 3/3 ARM: dts: imx6sl: add baud clock and clock-names for ssi

In reply to Shengjiu Wang

Baud clock is used for bit clock generation in master mode. Ipg clock is peripheral clock and peripheral access clock.

---
 arch/arm/boot/dts/imx6sl.dtsi |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
arch/arm/boot/dts/imx6sl.dtsi +9 -3
index ba67714..dfd83e6 100644
@@ -231,7 +231,9 @@
 							"fsl,imx51-ssi";
 					reg = <0x02028000 0x4000>;
 					interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>;
-					clocks = <&clks IMX6SL_CLK_SSI1>;
+					clocks = <&clks IMX6SL_CLK_SSI1_IPG>,
+						 <&clks IMX6SL_CLK_SSI1>;
+					clock-names = "ipg", "baud";
 					dmas = <&sdma 37 1 0>,
 					       <&sdma 38 1 0>;
 					dma-names = "rx", "tx";
@@ -245,7 +247,9 @@
 							"fsl,imx51-ssi";
 					reg = <0x0202c000 0x4000>;
 					interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;
-					clocks = <&clks IMX6SL_CLK_SSI2>;
+					clocks = <&clks IMX6SL_CLK_SSI2_IPG>,
+						 <&clks IMX6SL_CLK_SSI2>;
+					clock-names = "ipg", "baud";
 					dmas = <&sdma 41 1 0>,
 					       <&sdma 42 1 0>;
 					dma-names = "rx", "tx";
@@ -259,7 +263,9 @@
 							"fsl,imx51-ssi";
 					reg = <0x02030000 0x4000>;
 					interrupts = <0 48 IRQ_TYPE_LEVEL_HIGH>;
-					clocks = <&clks IMX6SL_CLK_SSI3>;
+					clocks = <&clks IMX6SL_CLK_SSI3_IPG>,
+						 <&clks IMX6SL_CLK_SSI3>;
+					clock-names = "ipg", "baud";
 					dmas = <&sdma 45 1 0>,
 					       <&sdma 46 1 0>;
 					dma-names = "rx", "tx";
Signature · 1 line
1.7.9.5
Applied
#9 lore raw
In reply to Shengjiu Wang
Quoted 7 lines · Shengjiu Wang

This serial patch is for refining the ssi clock tree for imx6sl, and update imx6qdl and imx6sl dts file.

Shengjiu Wang (3):
ARM: clk-imx6sl: refine clock tree for SSI
ARM: dts: imx6qdl: add baud clock and clock-names for ssi
ARM: dts: imx6sl: add baud clock and clock-names for ssi

Applied all, thanks.