memory: tegra30-emc: Use devm_tegra_core_dev_init_opp_table()

Use common devm_tegra_core_dev_init_opp_table() helper for the OPP table
initialization.

Tested-by: Peter Geis <pgwipeout@gmail.com> # Ouya T30
Tested-by: Matt Merhar <mattmerhar@protonmail.com> # Ouya T30
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/drivers/memory/tegra/tegra30-emc.c b/drivers/memory/tegra/tegra30-emc.c
index a2f2738ccb942d4a6f0ebfac4274a997ffe1dc95..63e1983f8a0d7bd028a467f26157464aac0b9da3 100644 (file)
--- a/drivers/memory/tegra/tegra30-emc.c
+++ b/drivers/memory/tegra/tegra30-emc.c
@@ -1480,49 +1480,6 @@ err_msg:
        return err;
 }
 
-static int tegra_emc_opp_table_init(struct tegra_emc *emc)
-{
-       u32 hw_version = BIT(tegra_sku_info.soc_speedo_id);
-       struct opp_table *hw_opp_table;
-       int err;
-
-       hw_opp_table = dev_pm_opp_set_supported_hw(emc->dev, &hw_version, 1);
-       err = PTR_ERR_OR_ZERO(hw_opp_table);
-       if (err) {
-               dev_err(emc->dev, "failed to set OPP supported HW: %d\n", err);
-               return err;
-       }
-
-       err = dev_pm_opp_of_add_table(emc->dev);
-       if (err) {
-               if (err == -ENODEV)
-                       dev_err(emc->dev, "OPP table not found, please update your device tree\n");
-               else
-                       dev_err(emc->dev, "failed to add OPP table: %d\n", err);
-
-               goto put_hw_table;
-       }
-
-       dev_info_once(emc->dev, "OPP HW ver. 0x%x, current clock rate %lu MHz\n",
-                     hw_version, clk_get_rate(emc->clk) / 1000000);
-
-       /* first dummy rate-set initializes voltage state */
-       err = dev_pm_opp_set_rate(emc->dev, clk_get_rate(emc->clk));
-       if (err) {
-               dev_err(emc->dev, "failed to initialize OPP clock: %d\n", err);
-               goto remove_table;
-       }
-
-       return 0;
-
-remove_table:
-       dev_pm_opp_of_remove_table(emc->dev);
-put_hw_table:
-       dev_pm_opp_put_supported_hw(hw_opp_table);
-
-       return err;
-}
-
 static void devm_tegra_emc_unset_callback(void *data)
 {
        tegra20_clk_set_emc_round_callback(NULL, NULL);
@@ -1568,6 +1525,7 @@ static int tegra_emc_init_clk(struct tegra_emc *emc)
 
 static int tegra_emc_probe(struct platform_device *pdev)
 {
+       struct tegra_core_opp_params opp_params = {};
        struct device_node *np;
        struct tegra_emc *emc;
        int err;
@@ -1617,7 +1575,9 @@ static int tegra_emc_probe(struct platform_device *pdev)
        if (err)
                return err;
 
-       err = tegra_emc_opp_table_init(emc);
+       opp_params.init_state = true;
+
+       err = devm_tegra_core_dev_init_opp_table(&pdev->dev, &opp_params);
        if (err)
                return err;