Skip to content

Commit

Permalink
ASoC: davinci-mcasp: Support for fck reparenting
Browse files Browse the repository at this point in the history
Optional DT property to specify the desired parent clock for the McASP fck
clock.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Peter Ujfalusi authored and Mark Brown committed Dec 10, 2013
1 parent b14899d commit ae726e9
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ Optional properties:
- pinctrl-0: Should specify pin control group used for this controller.
- pinctrl-names: Should contain only one value - "default", for more details
please refer to pinctrl-bindings.txt

- fck_parent : Should contain a valid clock name which will be used as parent
for the McASP fck

Example:

Expand Down
44 changes: 44 additions & 0 deletions sound/soc/davinci/davinci-mcasp.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/io.h>
#include <linux/clk.h>
#include <linux/pm_runtime.h>
#include <linux/of.h>
#include <linux/of_platform.h>
Expand Down Expand Up @@ -823,6 +824,46 @@ static const struct of_device_id mcasp_dt_ids[] = {
};
MODULE_DEVICE_TABLE(of, mcasp_dt_ids);

static int mcasp_reparent_fck(struct platform_device *pdev)
{
struct device_node *node = pdev->dev.of_node;
struct clk *gfclk, *parent_clk;
const char *parent_name;
int ret;

if (!node)
return 0;

parent_name = of_get_property(node, "fck_parent", NULL);
if (!parent_name)
return 0;

gfclk = clk_get(&pdev->dev, "fck");
if (IS_ERR(gfclk)) {
dev_err(&pdev->dev, "failed to get fck\n");
return PTR_ERR(gfclk);
}

parent_clk = clk_get(NULL, parent_name);
if (IS_ERR(parent_clk)) {
dev_err(&pdev->dev, "failed to get parent clock\n");
ret = PTR_ERR(parent_clk);
goto err1;
}

ret = clk_set_parent(gfclk, parent_clk);
if (ret) {
dev_err(&pdev->dev, "failed to reparent fck\n");
goto err2;
}

err2:
clk_put(parent_clk);
err1:
clk_put(gfclk);
return ret;
}

static struct snd_platform_data *davinci_mcasp_set_pdata_from_of(
struct platform_device *pdev)
{
Expand Down Expand Up @@ -1052,6 +1093,9 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
mcasp->dma_data[SNDRV_PCM_STREAM_CAPTURE].filter_data = "rx";

dev_set_drvdata(&pdev->dev, mcasp);

mcasp_reparent_fck(pdev);

ret = snd_soc_register_component(&pdev->dev, &davinci_mcasp_component,
&davinci_mcasp_dai[pdata->op_mode], 1);

Expand Down

0 comments on commit ae726e9

Please sign in to comment.