AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ASoC: pxa-ssp: add support for an external clock in devicetree

Browse Source 
Allow setting a clock called 'extclk' in the device of the ssp-dai
device. If specified, this clock will be set to the mclk rate from the
DAI's .set_sysclk() callback. The DAI will also configure itself to
use that external clock.

Signed-off-by: Daniel Mack <daniel@zonque.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Daniel Mack 2018-07-02 17:11:00 +02:00 committed by Mark Brown
parent 74b37e299f
commit 90eb6b59d3
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/devicetree/bindings/sound/mrvl,pxa-ssp.txt
View File

@ -5,6 +5,14 @@ Required properties:
compatible Must be "mrvl,pxa-ssp-dai" compatible Must be "mrvl,pxa-ssp-dai"
port A phandle reference to a PXA ssp upstream device port A phandle reference to a PXA ssp upstream device
Optional properties:
clock-names
clocks Through "clock-names" and "clocks", external clocks
can be configured. If a clock names "extclk" exists,
it will be set to the mclk rate of the audio stream
and be used as clock provider of the DAI.
Example: Example:
/* upstream device */ /* upstream device */

25
sound/soc/pxa/pxa-ssp.c
View File

@ -41,6 +41,7 @@
*/ */
struct ssp_priv { struct ssp_priv {
struct ssp_device *ssp; struct ssp_device *ssp;
struct clk *extclk;
unsigned long ssp_clk; unsigned long ssp_clk;
unsigned int sysclk; unsigned int sysclk;
unsigned int dai_fmt; unsigned int dai_fmt;
@ -205,6 +206,21 @@ static int pxa_ssp_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
u32 sscr0 = pxa_ssp_read_reg(ssp, SSCR0) & u32 sscr0 = pxa_ssp_read_reg(ssp, SSCR0) &
~(SSCR0_ECS | SSCR0_NCS | SSCR0_MOD | SSCR0_ACS); ~(SSCR0_ECS | SSCR0_NCS | SSCR0_MOD | SSCR0_ACS);
if (priv->extclk) {
int ret;
/*
* For DT based boards, if an extclk is given, use it
* here and configure PXA_SSP_CLK_EXT.
*/
ret = clk_set_rate(priv->extclk, freq);
if (ret < 0)
return ret;
clk_id = PXA_SSP_CLK_EXT;
}
dev_dbg(&ssp->pdev->dev, dev_dbg(&ssp->pdev->dev,
"pxa_ssp_set_dai_sysclk id: %d, clk_id %d, freq %u\n", "pxa_ssp_set_dai_sysclk id: %d, clk_id %d, freq %u\n",
cpu_dai->id, clk_id, freq); cpu_dai->id, clk_id, freq);
@ -774,6 +790,15 @@ static int pxa_ssp_probe(struct snd_soc_dai *dai)
ret = -ENODEV; ret = -ENODEV;
goto err_priv; goto err_priv;
} }
priv->extclk = devm_clk_get(dev, "extclk");
if (IS_ERR(priv->extclk)) {
ret = PTR_ERR(priv->extclk);
if (ret == -EPROBE_DEFER)
return ret;
priv->extclk = NULL;
}
} else { } else {
priv->ssp = pxa_ssp_request(dai->id + 1, "SoC audio"); priv->ssp = pxa_ssp_request(dai->id + 1, "SoC audio");
if (priv->ssp == NULL) { if (priv->ssp == NULL) {