diff options
author | Prashant Gaikwad <pgaikwad@nvidia.com> | 2013-01-11 03:01:25 -0500 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2013-01-28 13:19:33 -0500 |
commit | 79cf5918aaed097144fe7e0e455958c817c8a534 (patch) | |
tree | 332e266d8c335831bd736e581832932f2bda1cc2 /sound | |
parent | 1e54f0a21e7debcd8acb0fe39adc6f81751e1b57 (diff) |
ASoC: tegra: remove auxdata
Configlink clock information is added to device tree. Get the clocks
using device node. Remove AUXDATA.
Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/tegra/tegra30_ahub.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sound/soc/tegra/tegra30_ahub.c b/sound/soc/tegra/tegra30_ahub.c index bb31c4123a7b..2355630367f7 100644 --- a/sound/soc/tegra/tegra30_ahub.c +++ b/sound/soc/tegra/tegra30_ahub.c | |||
@@ -299,15 +299,6 @@ static const char * const configlink_clocks[] = { | |||
299 | "spdif_in", | 299 | "spdif_in", |
300 | }; | 300 | }; |
301 | 301 | ||
302 | struct of_dev_auxdata ahub_auxdata[] = { | ||
303 | OF_DEV_AUXDATA("nvidia,tegra30-i2s", 0x70080300, "tegra30-i2s.0", NULL), | ||
304 | OF_DEV_AUXDATA("nvidia,tegra30-i2s", 0x70080400, "tegra30-i2s.1", NULL), | ||
305 | OF_DEV_AUXDATA("nvidia,tegra30-i2s", 0x70080500, "tegra30-i2s.2", NULL), | ||
306 | OF_DEV_AUXDATA("nvidia,tegra30-i2s", 0x70080600, "tegra30-i2s.3", NULL), | ||
307 | OF_DEV_AUXDATA("nvidia,tegra30-i2s", 0x70080700, "tegra30-i2s.4", NULL), | ||
308 | {} | ||
309 | }; | ||
310 | |||
311 | #define LAST_REG(name) \ | 302 | #define LAST_REG(name) \ |
312 | (TEGRA30_AHUB_##name + \ | 303 | (TEGRA30_AHUB_##name + \ |
313 | (TEGRA30_AHUB_##name##_STRIDE * TEGRA30_AHUB_##name##_COUNT) - 4) | 304 | (TEGRA30_AHUB_##name##_STRIDE * TEGRA30_AHUB_##name##_COUNT) - 4) |
@@ -451,7 +442,7 @@ static int tegra30_ahub_probe(struct platform_device *pdev) | |||
451 | * Ensure that here. | 442 | * Ensure that here. |
452 | */ | 443 | */ |
453 | for (i = 0; i < ARRAY_SIZE(configlink_clocks); i++) { | 444 | for (i = 0; i < ARRAY_SIZE(configlink_clocks); i++) { |
454 | clk = clk_get_sys(NULL, configlink_clocks[i]); | 445 | clk = clk_get(&pdev->dev, configlink_clocks[i]); |
455 | if (IS_ERR(clk)) { | 446 | if (IS_ERR(clk)) { |
456 | dev_err(&pdev->dev, "Can't get clock %s\n", | 447 | dev_err(&pdev->dev, "Can't get clock %s\n", |
457 | configlink_clocks[i]); | 448 | configlink_clocks[i]); |
@@ -569,8 +560,7 @@ static int tegra30_ahub_probe(struct platform_device *pdev) | |||
569 | goto err_pm_disable; | 560 | goto err_pm_disable; |
570 | } | 561 | } |
571 | 562 | ||
572 | of_platform_populate(pdev->dev.of_node, NULL, ahub_auxdata, | 563 | of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev); |
573 | &pdev->dev); | ||
574 | 564 | ||
575 | return 0; | 565 | return 0; |
576 | 566 | ||