Revert "ASoC: tegra: remove auxdata"
Dan Willemsen [Sat, 20 Jul 2013 22:11:21 +0000 (15:11 -0700)]
This reverts commit 79cf5918aaed097144fe7e0e455958c817c8a534.

sound/soc/tegra/tegra30_ahub.c

index e5cfb4a..809854b 100644 (file)
@@ -299,6 +299,15 @@ static const char * const configlink_clocks[] = {
        "spdif_in",
 };
 
+struct of_dev_auxdata ahub_auxdata[] = {
+       OF_DEV_AUXDATA("nvidia,tegra30-i2s", 0x70080300, "tegra30-i2s.0", NULL),
+       OF_DEV_AUXDATA("nvidia,tegra30-i2s", 0x70080400, "tegra30-i2s.1", NULL),
+       OF_DEV_AUXDATA("nvidia,tegra30-i2s", 0x70080500, "tegra30-i2s.2", NULL),
+       OF_DEV_AUXDATA("nvidia,tegra30-i2s", 0x70080600, "tegra30-i2s.3", NULL),
+       OF_DEV_AUXDATA("nvidia,tegra30-i2s", 0x70080700, "tegra30-i2s.4", NULL),
+       {}
+};
+
 #define LAST_REG(name) \
        (TEGRA30_AHUB_##name + \
         (TEGRA30_AHUB_##name##_STRIDE * TEGRA30_AHUB_##name##_COUNT) - 4)
@@ -442,7 +451,7 @@ static int tegra30_ahub_probe(struct platform_device *pdev)
         * Ensure that here.
         */
        for (i = 0; i < ARRAY_SIZE(configlink_clocks); i++) {
-               clk = clk_get(&pdev->dev, configlink_clocks[i]);
+               clk = clk_get_sys(NULL, configlink_clocks[i]);
                if (IS_ERR(clk)) {
                        dev_err(&pdev->dev, "Can't get clock %s\n",
                                configlink_clocks[i]);
@@ -560,7 +569,8 @@ static int tegra30_ahub_probe(struct platform_device *pdev)
                        goto err_pm_disable;
        }
 
-       of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev);
+       of_platform_populate(pdev->dev.of_node, NULL, ahub_auxdata,
+                            &pdev->dev);
 
        return 0;