| Message ID | 1397041577-9580-1-git-send-email-Guangyu.Chen@freescale.com |
|---|---|
| State | Superseded, archived |
| Headers | show |
> Subject: [PATCH v4] ASoC: fsl_sai: Add clock controls for SAI > > The SAI mainly has the following clocks: > bus clock > control and configure registers and to generate synchronous > interrupts and DMA requests. > > mclk1, mclk2, mclk3 > to generate the bit clock when the receiver or transmitter is > configured for an internally generated bit clock. > > So this patch adds these clocks and their clock controls to the driver, > meanwhile, corrects the existing DTS accordingly so those platforms can > benifit from the further feature with different clock sources. > > Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com> > CC: Xiubo Li <Li.Xiubo@freescale.com> > Acked-by: Shawn Guo <shawn.guo@linaro.org> > --- > > @Xiubo > Even though you've tested it before, I'd still like to wait for your test > result to this newer version. > > Changelog > v4: > * Merged into single patch. > * Fixed bus clock ID on vf610. > v3: > * Use int type for ret instead of u32. > * Added Acked-by and Tested-by from Xiubo Li. > v2: > * Appended two extra mclks to the driver since SAI actually has three. > * Renamed clock name to 'bus' and 'mclk' according to the reference manual. > > .../devicetree/bindings/sound/fsl-sai.txt | 9 ++-- > arch/arm/boot/dts/vf610.dtsi | 6 ++- > sound/soc/fsl/fsl_sai.c | 51 ++++++++++++++++++++- > - > sound/soc/fsl/fsl_sai.h | 4 ++ > 4 files changed, 61 insertions(+), 9 deletions(-) > > diff --git a/Documentation/devicetree/bindings/sound/fsl-sai.txt > b/Documentation/devicetree/bindings/sound/fsl-sai.txt > index 35c09fe..0f4e238 100644 > --- a/Documentation/devicetree/bindings/sound/fsl-sai.txt > +++ b/Documentation/devicetree/bindings/sound/fsl-sai.txt > @@ -10,7 +10,8 @@ Required properties: > - compatible: Compatible list, contains "fsl,vf610-sai" or "fsl,imx6sx-sai". > - reg: Offset and length of the register set for the device. > - clocks: Must contain an entry for each entry in clock-names. > -- clock-names : Must include the "sai" entry. > +- clock-names : Must include the "bus" for register access and "mclk1" > "mclk2" > + "mclk3" for bit clock and frame clock providing. > - dmas : Generic dma devicetree binding as described in > Documentation/devicetree/bindings/dma/dma.txt. > - dma-names : Two dmas have to be defined, "tx" and "rx". > @@ -30,8 +31,10 @@ sai2: sai@40031000 { > reg = <0x40031000 0x1000>; > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_sai2_1>; > - clocks = <&clks VF610_CLK_SAI2>; > - clock-names = "sai"; > + clocks = <&clks VF610_CLK_PLATFORM_BUS>, > + <&clks VF610_CLK_SAI2>, > + <&clks 0>, <&clks 0>; > + clock-names = "bus", "mclk1", "mclk2", "mclk3"; > dma-names = "tx", "rx"; > dmas = <&edma0 0 VF610_EDMA_MUXID0_SAI2_TX>, > <&edma0 0 VF610_EDMA_MUXID0_SAI2_RX>; > diff --git a/arch/arm/boot/dts/vf610.dtsi b/arch/arm/boot/dts/vf610.dtsi > index d31ce1b..4c3cd59 100644 > --- a/arch/arm/boot/dts/vf610.dtsi > +++ b/arch/arm/boot/dts/vf610.dtsi > @@ -139,8 +139,10 @@ > compatible = "fsl,vf610-sai"; > reg = <0x40031000 0x1000>; > interrupts = <0 86 0x04>; > - clocks = <&clks VF610_CLK_SAI2>; > - clock-names = "sai"; > + clocks = <&clks VF610_CLK_PLATFORM_BUS>, > + <&clks VF610_CLK_SAI2>, > + <&clks 0>, <&clks 0>; > + clock-names = "bus", "mclk1", "mclk2", "mclk3"; Yes, this okey for Vybrid. On Vybrid, only the 'bus' and 'mclk1' are present, and the 'bus' clock is Enable by default. > status = "disabled"; > }; > > diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c > index db9f75e..7cd4af9 100644 > --- a/sound/soc/fsl/fsl_sai.c > +++ b/sound/soc/fsl/fsl_sai.c > @@ -401,7 +401,23 @@ static int fsl_sai_startup(struct snd_pcm_substream > *substream, > struct snd_soc_dai *cpu_dai) > { > struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai); > - u32 reg; > + struct device *dev = &sai->pdev->dev; > + u32 reg, i; > + int ret; > + > + ret = clk_prepare_enable(sai->bus_clk); > + if (ret) { > + dev_err(dev, "failed to enable bus clock\n"); > + return ret; > + } > + > + for (i = 0; i < FSL_SAI_MCLK_MAX; i++) { > + ret = clk_prepare_enable(sai->mclk_clk[i]); > + if (ret) { > + dev_err(dev, "failed to enable mclk%d clock\n", i + 1); > + goto err; > + } > + } > Why prepare and enable all the mclks here ? And at last only one of 'bus', 'mclk1', 'mclk2' and 'mclk3' will be selected To generate the bit clock. How about just prepare and enable the selected one ? > if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) > reg = FSL_SAI_TCR3; > @@ -412,13 +428,20 @@ static int fsl_sai_startup(struct snd_pcm_substream > *substream, > FSL_SAI_CR3_TRCE); > > return 0; > + > +err: > + for (; i > 0; i--) > + clk_disable_unprepare(sai->mclk_clk[i - 1]); > + clk_disable_unprepare(sai->bus_clk); > + > + return ret; > } > > static void fsl_sai_shutdown(struct snd_pcm_substream *substream, > struct snd_soc_dai *cpu_dai) > { > struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai); > - u32 reg; > + u32 reg, i; > > if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) > reg = FSL_SAI_TCR3; > @@ -427,6 +450,10 @@ static void fsl_sai_shutdown(struct snd_pcm_substream > *substream, > > regmap_update_bits(sai->regmap, reg, FSL_SAI_CR3_TRCE, > ~FSL_SAI_CR3_TRCE); > + > + for (i = 0; i < FSL_SAI_MCLK_MAX; i++) > + clk_disable_unprepare(sai->mclk_clk[i]); > + clk_disable_unprepare(sai->bus_clk); > } > > static const struct snd_soc_dai_ops fsl_sai_pcm_dai_ops = { > @@ -559,7 +586,8 @@ static int fsl_sai_probe(struct platform_device *pdev) > struct fsl_sai *sai; > struct resource *res; > void __iomem *base; > - int irq, ret; > + char tmp[8]; > + int irq, ret, i; > > sai = devm_kzalloc(&pdev->dev, sizeof(*sai), GFP_KERNEL); > if (!sai) > @@ -582,12 +610,27 @@ static int fsl_sai_probe(struct platform_device *pdev) > return PTR_ERR(base); > > sai->regmap = devm_regmap_init_mmio_clk(&pdev->dev, > - "sai", base, &fsl_sai_regmap_config); > + "bus", base, &fsl_sai_regmap_config); > if (IS_ERR(sai->regmap)) { > dev_err(&pdev->dev, "regmap init failed\n"); > return PTR_ERR(sai->regmap); > } > > + sai->bus_clk = devm_clk_get(&pdev->dev, "bus"); > + if (IS_ERR(sai->bus_clk)) { > + dev_err(&pdev->dev, "failed to get bus clock\n"); > + return PTR_ERR(sai->bus_clk); > + } > + > + for (i = 0; i < FSL_SAI_MCLK_MAX; i++) { > + sprintf(tmp, "mclk%d", i + 1); > + sai->mclk_clk[i] = devm_clk_get(&pdev->dev, tmp); > + if (IS_ERR(sai->mclk_clk[i])) { > + dev_err(&pdev->dev, "failed to get mclk%d clock\n", i + 1); > + return PTR_ERR(sai->mclk_clk[i]); > + } > + } > + > irq = platform_get_irq(pdev, 0); > if (irq < 0) { > dev_err(&pdev->dev, "no irq for node %s\n", np->full_name); > diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h > index 677670d..0e6c9f5 100644 > --- a/sound/soc/fsl/fsl_sai.h > +++ b/sound/soc/fsl/fsl_sai.h > @@ -119,6 +119,8 @@ > #define FSL_SAI_CLK_MAST2 2 > #define FSL_SAI_CLK_MAST3 3 > > +#define FSL_SAI_MCLK_MAX 3 > + > /* SAI data transfer numbers per DMA request */ > #define FSL_SAI_MAXBURST_TX 6 > #define FSL_SAI_MAXBURST_RX 6 > @@ -126,6 +128,8 @@ > struct fsl_sai { > struct platform_device *pdev; > struct regmap *regmap; > + struct clk *bus_clk; > + struct clk *mclk_clk[FSL_SAI_MCLK_MAX]; > > bool big_endian_regs; > bool big_endian_data; > -- > 1.8.4 > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Apr 10, 2014 at 03:39:51PM +0800, Xiubo Li-B47053 wrote: > > diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c > > index db9f75e..7cd4af9 100644 > > --- a/sound/soc/fsl/fsl_sai.c > > +++ b/sound/soc/fsl/fsl_sai.c > > @@ -401,7 +401,23 @@ static int fsl_sai_startup(struct snd_pcm_substream > > *substream, > > struct snd_soc_dai *cpu_dai) > > { > > struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai); > > - u32 reg; > > + struct device *dev = &sai->pdev->dev; > > + u32 reg, i; > > + int ret; > > + > > + ret = clk_prepare_enable(sai->bus_clk); > > + if (ret) { > > + dev_err(dev, "failed to enable bus clock\n"); > > + return ret; > > + } > > + > > + for (i = 0; i < FSL_SAI_MCLK_MAX; i++) { > > + ret = clk_prepare_enable(sai->mclk_clk[i]); > > + if (ret) { > > + dev_err(dev, "failed to enable mclk%d clock\n", i + 1); > > + goto err; > > + } > > + } > > > > Why prepare and enable all the mclks here ? > And at last only one of 'bus', 'mclk1', 'mclk2' and 'mclk3' will be selected > To generate the bit clock. How about just prepare and enable the selected > one ? That's a fair suggestion. I'll do the revise. But in this way. We can provisionally drop the clock enabling part and add them later after my clock dividing patch is ready. Thank you, Nicolin -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/sound/fsl-sai.txt b/Documentation/devicetree/bindings/sound/fsl-sai.txt index 35c09fe..0f4e238 100644 --- a/Documentation/devicetree/bindings/sound/fsl-sai.txt +++ b/Documentation/devicetree/bindings/sound/fsl-sai.txt @@ -10,7 +10,8 @@ Required properties: - compatible: Compatible list, contains "fsl,vf610-sai" or "fsl,imx6sx-sai". - reg: Offset and length of the register set for the device. - clocks: Must contain an entry for each entry in clock-names. -- clock-names : Must include the "sai" entry. +- clock-names : Must include the "bus" for register access and "mclk1" "mclk2" + "mclk3" for bit clock and frame clock providing. - dmas : Generic dma devicetree binding as described in Documentation/devicetree/bindings/dma/dma.txt. - dma-names : Two dmas have to be defined, "tx" and "rx". @@ -30,8 +31,10 @@ sai2: sai@40031000 { reg = <0x40031000 0x1000>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sai2_1>; - clocks = <&clks VF610_CLK_SAI2>; - clock-names = "sai"; + clocks = <&clks VF610_CLK_PLATFORM_BUS>, + <&clks VF610_CLK_SAI2>, + <&clks 0>, <&clks 0>; + clock-names = "bus", "mclk1", "mclk2", "mclk3"; dma-names = "tx", "rx"; dmas = <&edma0 0 VF610_EDMA_MUXID0_SAI2_TX>, <&edma0 0 VF610_EDMA_MUXID0_SAI2_RX>; diff --git a/arch/arm/boot/dts/vf610.dtsi b/arch/arm/boot/dts/vf610.dtsi index d31ce1b..4c3cd59 100644 --- a/arch/arm/boot/dts/vf610.dtsi +++ b/arch/arm/boot/dts/vf610.dtsi @@ -139,8 +139,10 @@ compatible = "fsl,vf610-sai"; reg = <0x40031000 0x1000>; interrupts = <0 86 0x04>; - clocks = <&clks VF610_CLK_SAI2>; - clock-names = "sai"; + clocks = <&clks VF610_CLK_PLATFORM_BUS>, + <&clks VF610_CLK_SAI2>, + <&clks 0>, <&clks 0>; + clock-names = "bus", "mclk1", "mclk2", "mclk3"; status = "disabled"; }; diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index db9f75e..7cd4af9 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -401,7 +401,23 @@ static int fsl_sai_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *cpu_dai) { struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai); - u32 reg; + struct device *dev = &sai->pdev->dev; + u32 reg, i; + int ret; + + ret = clk_prepare_enable(sai->bus_clk); + if (ret) { + dev_err(dev, "failed to enable bus clock\n"); + return ret; + } + + for (i = 0; i < FSL_SAI_MCLK_MAX; i++) { + ret = clk_prepare_enable(sai->mclk_clk[i]); + if (ret) { + dev_err(dev, "failed to enable mclk%d clock\n", i + 1); + goto err; + } + } if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) reg = FSL_SAI_TCR3; @@ -412,13 +428,20 @@ static int fsl_sai_startup(struct snd_pcm_substream *substream, FSL_SAI_CR3_TRCE); return 0; + +err: + for (; i > 0; i--) + clk_disable_unprepare(sai->mclk_clk[i - 1]); + clk_disable_unprepare(sai->bus_clk); + + return ret; } static void fsl_sai_shutdown(struct snd_pcm_substream *substream, struct snd_soc_dai *cpu_dai) { struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai); - u32 reg; + u32 reg, i; if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) reg = FSL_SAI_TCR3; @@ -427,6 +450,10 @@ static void fsl_sai_shutdown(struct snd_pcm_substream *substream, regmap_update_bits(sai->regmap, reg, FSL_SAI_CR3_TRCE, ~FSL_SAI_CR3_TRCE); + + for (i = 0; i < FSL_SAI_MCLK_MAX; i++) + clk_disable_unprepare(sai->mclk_clk[i]); + clk_disable_unprepare(sai->bus_clk); } static const struct snd_soc_dai_ops fsl_sai_pcm_dai_ops = { @@ -559,7 +586,8 @@ static int fsl_sai_probe(struct platform_device *pdev) struct fsl_sai *sai; struct resource *res; void __iomem *base; - int irq, ret; + char tmp[8]; + int irq, ret, i; sai = devm_kzalloc(&pdev->dev, sizeof(*sai), GFP_KERNEL); if (!sai) @@ -582,12 +610,27 @@ static int fsl_sai_probe(struct platform_device *pdev) return PTR_ERR(base); sai->regmap = devm_regmap_init_mmio_clk(&pdev->dev, - "sai", base, &fsl_sai_regmap_config); + "bus", base, &fsl_sai_regmap_config); if (IS_ERR(sai->regmap)) { dev_err(&pdev->dev, "regmap init failed\n"); return PTR_ERR(sai->regmap); } + sai->bus_clk = devm_clk_get(&pdev->dev, "bus"); + if (IS_ERR(sai->bus_clk)) { + dev_err(&pdev->dev, "failed to get bus clock\n"); + return PTR_ERR(sai->bus_clk); + } + + for (i = 0; i < FSL_SAI_MCLK_MAX; i++) { + sprintf(tmp, "mclk%d", i + 1); + sai->mclk_clk[i] = devm_clk_get(&pdev->dev, tmp); + if (IS_ERR(sai->mclk_clk[i])) { + dev_err(&pdev->dev, "failed to get mclk%d clock\n", i + 1); + return PTR_ERR(sai->mclk_clk[i]); + } + } + irq = platform_get_irq(pdev, 0); if (irq < 0) { dev_err(&pdev->dev, "no irq for node %s\n", np->full_name); diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h index 677670d..0e6c9f5 100644 --- a/sound/soc/fsl/fsl_sai.h +++ b/sound/soc/fsl/fsl_sai.h @@ -119,6 +119,8 @@ #define FSL_SAI_CLK_MAST2 2 #define FSL_SAI_CLK_MAST3 3 +#define FSL_SAI_MCLK_MAX 3 + /* SAI data transfer numbers per DMA request */ #define FSL_SAI_MAXBURST_TX 6 #define FSL_SAI_MAXBURST_RX 6 @@ -126,6 +128,8 @@ struct fsl_sai { struct platform_device *pdev; struct regmap *regmap; + struct clk *bus_clk; + struct clk *mclk_clk[FSL_SAI_MCLK_MAX]; bool big_endian_regs; bool big_endian_data;
The SAI mainly has the following clocks: bus clock control and configure registers and to generate synchronous interrupts and DMA requests. mclk1, mclk2, mclk3 to generate the bit clock when the receiver or transmitter is configured for an internally generated bit clock. So this patch adds these clocks and their clock controls to the driver, meanwhile, corrects the existing DTS accordingly so those platforms can benifit from the further feature with different clock sources. Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com> CC: Xiubo Li <Li.Xiubo@freescale.com> Acked-by: Shawn Guo <shawn.guo@linaro.org> --- @Xiubo Even though you've tested it before, I'd still like to wait for your test result to this newer version. Changelog v4: * Merged into single patch. * Fixed bus clock ID on vf610. v3: * Use int type for ret instead of u32. * Added Acked-by and Tested-by from Xiubo Li. v2: * Appended two extra mclks to the driver since SAI actually has three. * Renamed clock name to 'bus' and 'mclk' according to the reference manual. .../devicetree/bindings/sound/fsl-sai.txt | 9 ++-- arch/arm/boot/dts/vf610.dtsi | 6 ++- sound/soc/fsl/fsl_sai.c | 51 ++++++++++++++++++++-- sound/soc/fsl/fsl_sai.h | 4 ++ 4 files changed, 61 insertions(+), 9 deletions(-)