ASoC: tegra: ahub: Use clk_bulk helpers

Use clk_bulk helpers to make code cleaner.

Tested-by: Peter Geis <pgwipeout@gmail.com> # Ouya T30 audio works
Tested-by: Matt Merhar <mattmerhar@protonmail.com> # Ouya T30 boot-tested
Tested-by: Dmitry Osipenko <digetx@gmail.com> # Nexus7 T30 audio works
Tested-by: Nicolas Chauvet <kwizart@gmail.com> # TK1 boot-tested
Acked-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Link: https://lore.kernel.org/r/20210120003154.26749-6-digetx@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/tegra/tegra30_ahub.c b/sound/soc/tegra/tegra30_ahub.c
index 8c32333cc08ccfb081fc27397561938f45975a9c..12ca8e3ca4f6efde7db47260ada80d2952c90ffe 100644 (file)
--- a/sound/soc/tegra/tegra30_ahub.c
+++ b/sound/soc/tegra/tegra30_ahub.c
@@ -45,8 +45,7 @@ static int tegra30_ahub_runtime_suspend(struct device *dev)
        regcache_cache_only(ahub->regmap_apbif, true);
        regcache_cache_only(ahub->regmap_ahub, true);
 
-       clk_disable_unprepare(ahub->clk_apbif);
-       clk_disable_unprepare(ahub->clk_d_audio);
+       clk_bulk_disable_unprepare(ahub->nclocks, ahub->clocks);
 
        return 0;
 }
@@ -66,17 +65,9 @@ static int tegra30_ahub_runtime_resume(struct device *dev)
 {
        int ret;
 
-       ret = clk_prepare_enable(ahub->clk_d_audio);
-       if (ret) {
-               dev_err(dev, "clk_enable d_audio failed: %d\n", ret);
+       ret = clk_bulk_prepare_enable(ahub->nclocks, ahub->clocks);
+       if (ret)
                return ret;
-       }
-       ret = clk_prepare_enable(ahub->clk_apbif);
-       if (ret) {
-               dev_err(dev, "clk_enable apbif failed: %d\n", ret);
-               clk_disable(ahub->clk_d_audio);
-               return ret;
-       }
 
        regcache_cache_only(ahub->regmap_apbif, false);
        regcache_cache_only(ahub->regmap_ahub, false);
@@ -559,19 +550,12 @@ static int tegra30_ahub_probe(struct platform_device *pdev)
        ahub->soc_data = soc_data;
        ahub->dev = &pdev->dev;
 
-       ahub->clk_d_audio = devm_clk_get(&pdev->dev, "d_audio");
-       if (IS_ERR(ahub->clk_d_audio)) {
-               dev_err(&pdev->dev, "Can't retrieve ahub d_audio clock\n");
-               ret = PTR_ERR(ahub->clk_d_audio);
-               return ret;
-       }
+       ahub->clocks[ahub->nclocks++].id = "apbif";
+       ahub->clocks[ahub->nclocks++].id = "d_audio";
 
-       ahub->clk_apbif = devm_clk_get(&pdev->dev, "apbif");
-       if (IS_ERR(ahub->clk_apbif)) {
-               dev_err(&pdev->dev, "Can't retrieve ahub apbif clock\n");
-               ret = PTR_ERR(ahub->clk_apbif);
+       ret = devm_clk_bulk_get(&pdev->dev, ahub->nclocks, ahub->clocks);
+       if (ret)
                return ret;
-       }
 
        res0 = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        regs_apbif = devm_ioremap_resource(&pdev->dev, res0);

diff --git a/sound/soc/tegra/tegra30_ahub.h b/sound/soc/tegra/tegra30_ahub.h
index 6889c5f23d021fa74d014bc08c6ad4dad28c522d..01480d7dc940bc1da0e8502ef4f9a355e3ab1eb6 100644 (file)
--- a/sound/soc/tegra/tegra30_ahub.h
+++ b/sound/soc/tegra/tegra30_ahub.h
@@ -511,8 +511,8 @@ struct tegra30_ahub_soc_data {
 struct tegra30_ahub {
        const struct tegra30_ahub_soc_data *soc_data;
        struct device *dev;
-       struct clk *clk_d_audio;
-       struct clk *clk_apbif;
+       struct clk_bulk_data clocks[2];
+       unsigned int nclocks;
        resource_size_t apbif_addr;
        struct regmap *regmap_apbif;
        struct regmap *regmap_ahub;