diff options
author | Kevin Hilman <khilman@deeprootsystems.com> | 2009-07-15 13:42:09 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-07-16 05:59:52 -0400 |
commit | 3e46a447396df99e2367fe1564651abaacc19c13 (patch) | |
tree | 479e915304f73ee54c5edcd7878363e7492c005a /sound/soc/davinci | |
parent | 9db9ed977d4f1a317f5f4d467d43025fa27223d8 (diff) |
ASoC: davinci: don't use clock names
clock name strings are no longer passed on platform_data. Instead,
we rely entirely on struct device and clkdev to find the right clock.
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/davinci')
-rw-r--r-- | sound/soc/davinci/davinci-i2s.c | 2 | ||||
-rw-r--r-- | sound/soc/davinci/davinci-mcasp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c index f7330e112be5..e5cd97b74c50 100644 --- a/sound/soc/davinci/davinci-i2s.c +++ b/sound/soc/davinci/davinci-i2s.c | |||
@@ -528,7 +528,7 @@ static int davinci_i2s_probe(struct platform_device *pdev) | |||
528 | goto err_release_region; | 528 | goto err_release_region; |
529 | } | 529 | } |
530 | 530 | ||
531 | dev->clk = clk_get(&pdev->dev, pdata->clk_name); | 531 | dev->clk = clk_get(&pdev->dev, NULL); |
532 | if (IS_ERR(dev->clk)) { | 532 | if (IS_ERR(dev->clk)) { |
533 | ret = -ENODEV; | 533 | ret = -ENODEV; |
534 | goto err_free_mem; | 534 | goto err_free_mem; |
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index b27aab60ece3..f0c034771062 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c | |||
@@ -764,7 +764,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev) | |||
764 | } | 764 | } |
765 | 765 | ||
766 | pdata = pdev->dev.platform_data; | 766 | pdata = pdev->dev.platform_data; |
767 | dev->clk = clk_get(&pdev->dev, pdata->clk_name); | 767 | dev->clk = clk_get(&pdev->dev, NULL); |
768 | if (IS_ERR(dev->clk)) { | 768 | if (IS_ERR(dev->clk)) { |
769 | ret = -ENODEV; | 769 | ret = -ENODEV; |
770 | goto err_release_region; | 770 | goto err_release_region; |