aboutsummaryrefslogtreecommitdiff
path: root/sound/soc/davinci
diff options
context:
space:
mode:
authorKevin Hilman <khilman@deeprootsystems.com>2009-07-15 10:42:09 -0700
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-07-16 10:59:52 +0100
commit3e46a447396df99e2367fe1564651abaacc19c13 (patch)
tree479e915304f73ee54c5edcd7878363e7492c005a /sound/soc/davinci
parent9db9ed977d4f1a317f5f4d467d43025fa27223d8 (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.c2
-rw-r--r--sound/soc/davinci/davinci-mcasp.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c
index f7330e112be..e5cd97b74c5 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)
goto err_release_region;
}
- dev->clk = clk_get(&pdev->dev, pdata->clk_name);
+ dev->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(dev->clk)) {
ret = -ENODEV;
goto err_free_mem;
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index b27aab60ece..f0c03477106 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)
}
pdata = pdev->dev.platform_data;
- dev->clk = clk_get(&pdev->dev, pdata->clk_name);
+ dev->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(dev->clk)) {
ret = -ENODEV;
goto err_release_region;