| Message ID | 1357891289-23500-6-git-send-email-pgaikwad@nvidia.com |
|---|---|
| State | Superseded, archived |
| Headers | show |
On 01/11/2013 01:01 AM, Prashant Gaikwad wrote: > Configlink clock information is added to device tree. Get the clocks > using device node. Remove AUXDATA. Cc'ing in the ASoC maintainers as an FYI and for Acks; this patch needs to go through the Tegra tree due to dependencies. > > Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com> > --- > 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 bb31c41..2355630 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[] = { > "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) > @@ -451,7 +442,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_sys(NULL, configlink_clocks[i]); > + clk = clk_get(&pdev->dev, configlink_clocks[i]); > if (IS_ERR(clk)) { > dev_err(&pdev->dev, "Can't get clock %s\n", > configlink_clocks[i]); > @@ -569,8 +560,7 @@ static int tegra30_ahub_probe(struct platform_device *pdev) > goto err_pm_disable; > } > > - of_platform_populate(pdev->dev.of_node, NULL, ahub_auxdata, > - &pdev->dev); > + of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev); > > return 0; > > -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Jan 11, 2013 at 01:59:28PM -0700, Stephen Warren wrote: > On 01/11/2013 01:01 AM, Prashant Gaikwad wrote: > > Configlink clock information is added to device tree. Get the clocks > > using device node. Remove AUXDATA. > > Cc'ing in the ASoC maintainers as an FYI and for Acks; this patch needs > to go through the Tegra tree due to dependencies. Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
diff --git a/sound/soc/tegra/tegra30_ahub.c b/sound/soc/tegra/tegra30_ahub.c index bb31c41..2355630 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[] = { "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) @@ -451,7 +442,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_sys(NULL, configlink_clocks[i]); + clk = clk_get(&pdev->dev, configlink_clocks[i]); if (IS_ERR(clk)) { dev_err(&pdev->dev, "Can't get clock %s\n", configlink_clocks[i]); @@ -569,8 +560,7 @@ static int tegra30_ahub_probe(struct platform_device *pdev) goto err_pm_disable; } - of_platform_populate(pdev->dev.of_node, NULL, ahub_auxdata, - &pdev->dev); + of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev); return 0;
Configlink clock information is added to device tree. Get the clocks using device node. Remove AUXDATA. Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com> --- sound/soc/tegra/tegra30_ahub.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-)