aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2011-07-01 15:56:14 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-07-04 11:49:24 -0400
commitb5f9cfed12dc639cce5a8b6e741352980e05a8a9 (patch)
tree450da526bc2db3ae4aa8b1e29152470c51be907f
parent956245e9cd229138ad26521c326650eed8b88333 (diff)
ASoC: Tegra: I2S: s/clk_get_sys/clk_get/
The clock needed by the I2S driver is associated with the I2S device name in the standard fashion. Hence, use clk_get(dev) instead of clk_get_sys(clk_name). Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/tegra/tegra_i2s.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/tegra/tegra_i2s.c b/sound/soc/tegra/tegra_i2s.c
index 6b817e20548c..2e5685512db0 100644
--- a/sound/soc/tegra/tegra_i2s.c
+++ b/sound/soc/tegra/tegra_i2s.c
@@ -348,7 +348,6 @@ struct snd_soc_dai_driver tegra_i2s_dai[] = {
348static __devinit int tegra_i2s_platform_probe(struct platform_device *pdev) 348static __devinit int tegra_i2s_platform_probe(struct platform_device *pdev)
349{ 349{
350 struct tegra_i2s * i2s; 350 struct tegra_i2s * i2s;
351 char clk_name[12]; /* tegra-i2s.0 */
352 struct resource *mem, *memregion, *dmareq; 351 struct resource *mem, *memregion, *dmareq;
353 int ret; 352 int ret;
354 353
@@ -383,8 +382,7 @@ static __devinit int tegra_i2s_platform_probe(struct platform_device *pdev)
383 } 382 }
384 dev_set_drvdata(&pdev->dev, i2s); 383 dev_set_drvdata(&pdev->dev, i2s);
385 384
386 snprintf(clk_name, sizeof(clk_name), DRV_NAME ".%d", pdev->id); 385 i2s->clk_i2s = clk_get(&pdev->dev, NULL);
387 i2s->clk_i2s = clk_get_sys(clk_name, NULL);
388 if (IS_ERR(i2s->clk_i2s)) { 386 if (IS_ERR(i2s->clk_i2s)) {
389 dev_err(&pdev->dev, "Can't retrieve i2s clock\n"); 387 dev_err(&pdev->dev, "Can't retrieve i2s clock\n");
390 ret = PTR_ERR(i2s->clk_i2s); 388 ret = PTR_ERR(i2s->clk_i2s);