ASoC: tegra: always use clk_get() in utility code

Now that all of the Tegra device trees have been updated to represent
the required audio clocks, remove the compatibility code from the Tegra
ASoC utility code, and always use clk_get() rather than clk_get_sys().

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 5 insertions, 18 deletions

diff --git a/sound/soc/tegra/tegra_asoc_utils.c b/sound/soc/tegra/tegra_asoc_utils.c
index 24fb001be7f4..d173880f290d 100644
--- a/sound/soc/tegra/tegra_asoc_utils.c
+++ b/sound/soc/tegra/tegra_asoc_utils.c
@@ -173,7 +173,6 @@ int tegra_asoc_utils_init(struct tegra_asoc_utils_data *data,
                           struct device *dev)
 {
         int ret;
-        bool new_clocks = false;
 
         data->dev = dev;
 
@@ -181,40 +180,28 @@ int tegra_asoc_utils_init(struct tegra_asoc_utils_data *data,
                 data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA20;
         else if (of_machine_is_compatible("nvidia,tegra30"))
                 data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA30;
-        else if (of_machine_is_compatible("nvidia,tegra114")) {
+        else if (of_machine_is_compatible("nvidia,tegra114"))
                 data->soc = TEGRA_ASOC_UTILS_SOC_TEGRA114;
-                new_clocks = true;
-        } else {
+        else {
                 dev_err(data->dev, "SoC unknown to Tegra ASoC utils\n");
                 return -EINVAL;
         }
 
-        if (new_clocks)
-                data->clk_pll_a = clk_get(dev, "pll_a");
-        else
-                data->clk_pll_a = clk_get_sys(NULL, "pll_a");
+        data->clk_pll_a = clk_get(dev, "pll_a");
         if (IS_ERR(data->clk_pll_a)) {
                 dev_err(data->dev, "Can't retrieve clk pll_a\n");
                 ret = PTR_ERR(data->clk_pll_a);
                 goto err;
         }
 
-        if (new_clocks)
-                data->clk_pll_a_out0 = clk_get(dev, "pll_a_out0");
-        else
-                data->clk_pll_a_out0 = clk_get_sys(NULL, "pll_a_out0");
+        data->clk_pll_a_out0 = clk_get(dev, "pll_a_out0");
         if (IS_ERR(data->clk_pll_a_out0)) {
                 dev_err(data->dev, "Can't retrieve clk pll_a_out0\n");
                 ret = PTR_ERR(data->clk_pll_a_out0);
                 goto err_put_pll_a;
         }
 
-        if (new_clocks)
-                data->clk_cdev1 = clk_get(dev, "mclk");
-        else if (data->soc == TEGRA_ASOC_UTILS_SOC_TEGRA20)
-                data->clk_cdev1 = clk_get_sys(NULL, "cdev1");
-        else
-                data->clk_cdev1 = clk_get_sys("extern1", NULL);
+        data->clk_cdev1 = clk_get(dev, "mclk");
         if (IS_ERR(data->clk_cdev1)) {
                 dev_err(data->dev, "Can't retrieve clk cdev1\n");
                 ret = PTR_ERR(data->clk_cdev1);