add spba clock for fsl audio IP
Subsystems (4)
v2 cover add spba clock for fsl audio IP
add spba clock for fsl audio IP
Changes in v2
- spba is a optional clock, compatible with previous devicetree.
- change the name from "dma" to "spba"
Shengjiu Wang (3):
ASoC: fsl_esai: spba clock is needed by esai device
ASoC: fsl_spdif: spba clk is needed by spdif device
ASoC: fsl_asrc: spba clock is needed by asrc device
Documentation/devicetree/bindings/sound/fsl,asrc.txt | 2 ++ Documentation/devicetree/bindings/sound/fsl,esai.txt | 2 ++ Documentation/devicetree/bindings/sound/fsl,spdif.txt | 2 ++ sound/soc/fsl/fsl_asrc.c | 10 ++++++++++ sound/soc/fsl/fsl_asrc.h | 1 + sound/soc/fsl/fsl_esai.c | 12 ++++++++++++ sound/soc/fsl/fsl_spdif.c | 14 ++++++++++++++ 7 files changed, 43 insertions(+)
Signature · 6 lines
1.9.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 1/3 ASoC: fsl_esai: spba clock is needed by esai device
ESAI need to enable the spba clock, when sdma is using share peripheral script. In this case, there is two spba master port is used, if don't enable the clock, the spba bus will have arbitration issue, which may cause read/write wrong data from/to ESAI registers.
--- Documentation/devicetree/bindings/sound/fsl,esai.txt | 2 ++ sound/soc/fsl/fsl_esai.c | 12 ++++++++++++ 2 files changed, 14 insertions(+)
Documentation/devicetree/bindings/sound/fsl,esai.txt +2 -0
@@ -27,6 +27,8 @@ Required properties: derive HCK, SCK and FS. "fsys" The system clock derived from ahb clock used to derive HCK, SCK and FS. + "spba" The spba clock is needed when two spba master port + is used. - fsl,fifo-depth : The number of elements in the transmit and receive FIFOs. This number is the maximum allowed value for
sound/soc/fsl/fsl_esai.c +12 -0
@@ -54,6 +54,7 @@ struct fsl_esai {struct clk *coreclk;struct clk *extalclk;struct clk *fsysclk; +struct clk *spbaclk;u32 fifo_depth;u32 slot_width;u32 slots;
@@ -469,6 +470,9 @@ static int fsl_esai_startup(struct snd_pcm_substream *substream, ret =clk_prepare_enable (esai_priv->coreclk);if (ret)return ret; + ret =clk_prepare_enable (esai_priv->spbaclk); +if (ret) + goto err_spbaclk;if (!IS_ERR (esai_priv->extalclk)) { ret =clk_prepare_enable (esai_priv->extalclk);if (ret)
@@ -499,6 +503,8 @@ err_fsysclk:if (!IS_ERR (esai_priv->extalclk))clk_disable_unprepare (esai_priv->extalclk); err_extalck: +clk_disable_unprepare (esai_priv->spbaclk); +err_spbaclk:clk_disable_unprepare (esai_priv->coreclk);return ret;
@@ -564,6 +570,7 @@ static void fsl_esai_shutdown(struct snd_pcm_substream *substream,clk_disable_unprepare (esai_priv->fsysclk);if (!IS_ERR (esai_priv->extalclk))clk_disable_unprepare (esai_priv->extalclk); +clk_disable_unprepare (esai_priv->spbaclk);clk_disable_unprepare (esai_priv->coreclk); }
@@ -819,6 +826,11 @@ static int fsl_esai_probe(struct platform_device *pdev)dev_warn (&pdev->dev,"failed to get fsys clock: %ld\n" ,PTR_ERR (esai_priv->fsysclk)); + esai_priv->spbaclk =devm_clk_get (&pdev->dev,"spba" ); +if (IS_ERR (esai_priv->spbaclk)) +dev_warn (&pdev->dev,"Cannot get spba clock: %ld\n" , +PTR_ERR (esai_priv->spbaclk)); + irq =platform_get_irq (pdev,0 );if (irq <0 ) {dev_err (&pdev->dev,"no irq for node %s\n" , pdev->name);
Signature · 1 line
1.9.1
Nicolin Chen
reviewerRe: [PATCH V2 1/3] ASoC: fsl_esai: spba clock is needed by esai device
Documentation/devicetree/bindings/sound/fsl,esai.txt Required properties: · line 31
Quoted 10 lines · Shengjiu Wang
Documentation/devicetree/bindings/sound/fsl,esai.txt +2
-0@@ -27,6 +27,8 @@ Required properties: derive HCK, SCK and FS. "fsys" The system clock derived from ahb clock used to derive HCK, SCK and FS. + "spba" The spba clock is needed when two spba master port + is used.
I was expecting a little bit more detail like:
+ "spba" The spba clock is required when ESAI is placed as
a bus slave of the Shared Peripheral Bus and when two or more bus masters (CPU, DMA or DSP) try to access it. This property is optional depending on the SoC design.
sound/soc/fsl/fsl_esai.c struct fsl_esai { · line 57
Quoted 9 lines
sound/soc/fsl/fsl_esai.c +1
-0@@ -54,6 +54,7 @@ struct fsl_esai {struct clk *coreclk;struct clk *extalclk;struct clk *fsysclk; +struct clk *spbaclk;
Please add one entry in the comment above for the new clock.
sound/soc/fsl/fsl_esai.c static int fsl_esai_probe(struct platform_device *pdev) · line 831
Quoted 7 lines
sound/soc/fsl/fsl_esai.c +3
-0@@ -819,6 +826,11 @@ static int fsl_esai_probe(struct platform_device *pdev)dev_warn (&pdev->dev,"failed to get fsys clock: %ld\n" ,PTR_ERR (esai_priv->fsysclk)); + esai_priv->spbaclk =devm_clk_get (&pdev->dev,"spba" ); +if (IS_ERR (esai_priv->spbaclk)) + dev_warn(&pdev->dev, "Cannot get spba clock: %ld\n",
It'd be better to write the warning following the previous one:
+ dev_warn(&pdev->dev, "failed to get spba clock: %ld\n",
PATCH v2 2/3 ASoC: fsl_spdif: spba clk is needed by spdif device
In reply to Shengjiu WangSPDIF need to enable the spba clock, when sdma is using share peripheral script. In this case, there is two spba master port is used, if don't enable the clock, the spba bus will have arbitration issue, which may cause read/write wrong data from/to SPDIF registers.
--- Documentation/devicetree/bindings/sound/fsl,spdif.txt | 2 ++ sound/soc/fsl/fsl_spdif.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+)
Documentation/devicetree/bindings/sound/fsl,spdif.txt +2 -0
@@ -27,6 +27,8 @@ Required properties: Transceiver Clock Diagram" of SoC reference manual. It can also be referred to TxClk_Source bit of register SPDIF_STC. + "spba" The spba clock is needed when two spba master port + is used. - big-endian : If this property is absent, the native endian mode will be in use as default, or the big endian mode
sound/soc/fsl/fsl_spdif.c +14 -0
@@ -106,6 +106,7 @@ struct fsl_spdif_priv {struct clk *rxclk;struct clk *coreclk;struct clk *sysclk; +struct clk *spbaclk;struct snd_dmaengine_dai_dma_data dma_params_tx;struct snd_dmaengine_dai_dma_data dma_params_rx;/* regcache for SRPC */
@@ -474,6 +475,12 @@ static int fsl_spdif_startup(struct snd_pcm_substream *substream,return ret; } + ret =clk_prepare_enable (spdif_priv->spbaclk); +if (ret) { +dev_err (&pdev->dev,"failed to enable spba clock\n" ); + goto err_spbaclk; + } + ret =spdif_softreset (spdif_priv);if (ret) {dev_err (&pdev->dev,"failed to soft reset\n" );
@@ -515,6 +522,8 @@ disable_txclk:for (i--; i >=0 ; i--)clk_disable_unprepare (spdif_priv->txclk[i]); err: +clk_disable_unprepare (spdif_priv->spbaclk); +err_spbaclk:clk_disable_unprepare (spdif_priv->coreclk);return ret;
@@ -548,6 +557,7 @@ static void fsl_spdif_shutdown(struct snd_pcm_substream *substream,spdif_intr_status_clear (spdif_priv);regmap_update_bits (regmap,REG_SPDIF_SCR ,SCR_LOW_POWER ,SCR_LOW_POWER ); +clk_disable_unprepare (spdif_priv->spbaclk);clk_disable_unprepare (spdif_priv->coreclk); } }
@@ -1261,6 +1271,10 @@ static int fsl_spdif_probe(struct platform_device *pdev)return PTR_ERR (spdif_priv->coreclk); } + spdif_priv->spbaclk =devm_clk_get (&pdev->dev,"spba" ); +if (IS_ERR (spdif_priv->spbaclk)) +dev_warn (&pdev->dev,"no spba clock in devicetree\n" ); +/* Select clock source for rx/tx clock */ spdif_priv->rxclk =devm_clk_get (&pdev->dev,"rxtx1" );if (IS_ERR (spdif_priv->rxclk)) {
Signature · 1 line
1.9.1
PATCH v2 3/3 ASoC: fsl_asrc: spba clock is needed by asrc device
In reply to Shengjiu WangASRC need to enable the spba clock, when sdma is using share peripheral script. In this case, there is two spba master port is used, if don't enable the clock, the spba bus will have arbitration issue, which may cause read/write wrong data from/to ASRC registers
--- Documentation/devicetree/bindings/sound/fsl,asrc.txt | 2 ++ sound/soc/fsl/fsl_asrc.c | 10 ++++++++++ sound/soc/fsl/fsl_asrc.h | 1 + 3 files changed, 13 insertions(+)
Documentation/devicetree/bindings/sound/fsl,asrc.txt +2 -0
@@ -25,6 +25,8 @@ Required properties: "mem" Peripheral access clock to access registers. "ipg" Peripheral clock to driver module. "asrck_<0-f>" Clock sources for input and output clock. + "spba" The spba clock is needed when two spba master port + is used. - big-endian : If this property is absent, the little endian mode will be in use as default. Otherwise, the big endian
sound/soc/fsl/fsl_asrc.c +10 -0
@@ -859,6 +859,10 @@ static int fsl_asrc_probe(struct platform_device *pdev)return PTR_ERR (asrc_priv->ipg_clk); } + asrc_priv->spba_clk =devm_clk_get (&pdev->dev,"spba" ); +if (IS_ERR (asrc_priv->spba_clk)) +dev_warn (&pdev->dev,"failed to get spba clock\n" ); +for (i =0 ; i <ASRC_CLK_MAX_NUM ; i++) {sprintf (tmp,"asrck_%x" , i); asrc_priv->asrck_clk[i] =devm_clk_get (&pdev->dev, tmp);
@@ -939,6 +943,9 @@ static int fsl_asrc_runtime_resume(struct device *dev) ret =clk_prepare_enable (asrc_priv->ipg_clk);if (ret) goto disable_mem_clk; + ret =clk_prepare_enable (asrc_priv->spba_clk); +if (ret) + goto disable_ipg_clk;for (i =0 ; i <ASRC_CLK_MAX_NUM ; i++) { ret =clk_prepare_enable (asrc_priv->asrck_clk[i]);if (ret)
@@ -950,6 +957,8 @@ static int fsl_asrc_runtime_resume(struct device *dev) disable_asrck_clk:for (i--; i >=0 ; i--)clk_disable_unprepare (asrc_priv->asrck_clk[i]); +clk_disable_unprepare (asrc_priv->spba_clk); +disable_ipg_clk:clk_disable_unprepare (asrc_priv->ipg_clk); disable_mem_clk:clk_disable_unprepare (asrc_priv->mem_clk);
@@ -963,6 +972,7 @@ static int fsl_asrc_runtime_suspend(struct device *dev)for (i =0 ; i <ASRC_CLK_MAX_NUM ; i++)clk_disable_unprepare (asrc_priv->asrck_clk[i]); +clk_disable_unprepare (asrc_priv->spba_clk);clk_disable_unprepare (asrc_priv->ipg_clk);clk_disable_unprepare (asrc_priv->mem_clk);
sound/soc/fsl/fsl_asrc.h +1 -0
@@ -442,6 +442,7 @@ struct fsl_asrc {unsigned long paddr;struct clk *mem_clk;struct clk *ipg_clk; +struct clk *spba_clk;struct clk *asrck_clk[ASRC_CLK_MAX_NUM ];spinlock_t lock;
Signature · 1 line
1.9.1
Rob Herring
maintainerRe: [PATCH V2 3/3] ASoC: fsl_asrc: spba clock is needed by asrc device
Quoted 17 lines · Shengjiu Wang
ASRC need to enable the spba clock, when sdma is using share peripheral script. In this case, there is two spba master port is used, if don't enable the clock, the spba bus will have arbitration issue, which may cause read/write wrong data from/to ASRC registers
Signed-off-by Shengjiu Wang <[email protected]>--- Documentation/devicetree/bindings/sound/fsl,asrc.txt | 2 ++ sound/soc/fsl/fsl_asrc.c | 10 ++++++++++ sound/soc/fsl/fsl_asrc.h | 1 + 3 files changed, 13 insertions(+)Documentation/devicetree/bindings/sound/fsl,asrc.txt +0
-0
Documentation/devicetree/bindings/sound/fsl,asrc.txt Required properties: · line 29
Quoted 5 lines
Documentation/devicetree/bindings/sound/fsl,asrc.txt +2
-0@@ -25,6 +25,8 @@ Required properties: "mem" Peripheral access clock to access registers. "ipg" Peripheral clock to driver module. "asrck_<0-f>" Clock sources for input and output clock. + "spba" The spba clock is needed when two spba master port + is used.
I'm assuming the same comments on patch 1 apply to all 3.
Rob
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Nicolin Chen
reviewerRe: [PATCH V2 3/3] ASoC: fsl_asrc: spba clock is needed by asrc device
Quoted 13 lines · Rob Herring
Quoted 12 lines · Shengjiu Wang
ASRC need to enable the spba clock, when sdma is using share peripheral script. In this case, there is two spba master port is used, if don't enable the clock, the spba bus will have arbitration issue, which may cause read/write wrong data from/to ASRC registers
Signed-off-by Shengjiu Wang <[email protected]>--- Documentation/devicetree/bindings/sound/fsl,asrc.txt | 2 ++ sound/soc/fsl/fsl_asrc.c | 10 ++++++++++ sound/soc/fsl/fsl_asrc.h | 1 + 3 files changed, 13 insertions(+)
Quoted 12 lines
Documentation/devicetree/bindings/sound/fsl,asrc.txt Required properties: · line 29
Quoted 10 lines
Documentation/devicetree/bindings/sound/fsl,asrc.txt +2
-0@@ -25,6 +25,8 @@ Required properties: "mem" Peripheral access clock to access registers. "ipg" Peripheral clock to driver module. "asrck_<0-f>" Clock sources for input and output clock. + "spba" The spba clock is needed when two spba master port + is used.I'm assuming the same comments on patch 1 apply to all 3.
Yes. I should have mentioned that.
Nicolin