cpufreq: ti: Migrate to dev_pm_opp_set_config()

The OPP core now provides a unified API for setting all configuration
types, i.e. dev_pm_opp_set_config().

Lets start using it.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>

diff --git a/drivers/cpufreq/ti-cpufreq.c b/drivers/cpufreq/ti-cpufreq.c
index 560d67a..df85a77 100644 (file)
--- a/drivers/cpufreq/ti-cpufreq.c
+++ b/drivers/cpufreq/ti-cpufreq.c
@@ -60,7 +60,6 @@ struct ti_cpufreq_data {
        struct device_node *opp_node;
        struct regmap *syscon;
        const struct ti_cpufreq_soc_data *soc_data;
-       struct opp_table *opp_table;
 };
 
 static unsigned long amx3_efuse_xlate(struct ti_cpufreq_data *opp_data,
@@ -324,10 +323,13 @@ static int ti_cpufreq_probe(struct platform_device *pdev)
 {
        u32 version[VERSION_COUNT];
        const struct of_device_id *match;
-       struct opp_table *ti_opp_table;
        struct ti_cpufreq_data *opp_data;
        const char * const default_reg_names[] = {"vdd", "vbb", NULL};
        int ret;
+       struct dev_pm_opp_config config = {
+               .supported_hw = version,
+               .supported_hw_count = ARRAY_SIZE(version),
+       };
 
        match = dev_get_platdata(&pdev->dev);
        if (!match)
@@ -370,32 +372,21 @@ static int ti_cpufreq_probe(struct platform_device *pdev)
        if (ret)
                goto fail_put_node;
 
-       ti_opp_table = dev_pm_opp_set_supported_hw(opp_data->cpu_dev,
-                                                  version, VERSION_COUNT);
-       if (IS_ERR(ti_opp_table)) {
-               dev_err(opp_data->cpu_dev,
-                       "Failed to set supported hardware\n");
-               ret = PTR_ERR(ti_opp_table);
-               goto fail_put_node;
-       }
-
-       opp_data->opp_table = ti_opp_table;
-
        if (opp_data->soc_data->multi_regulator) {
-               const char * const *reg_names = default_reg_names;
-
                if (opp_data->soc_data->reg_names)
-                       reg_names = opp_data->soc_data->reg_names;
-               ti_opp_table = dev_pm_opp_set_regulators(opp_data->cpu_dev,
-                                                        reg_names);
-               if (IS_ERR(ti_opp_table)) {
-                       dev_pm_opp_put_supported_hw(opp_data->opp_table);
-                       ret =  PTR_ERR(ti_opp_table);
-                       goto fail_put_node;
-               }
+                       config.regulator_names = opp_data->soc_data->reg_names;
+               else
+                       config.regulator_names = default_reg_names;
+       }
+
+       ret = dev_pm_opp_set_config(opp_data->cpu_dev, &config);
+       if (ret < 0) {
+               dev_err(opp_data->cpu_dev, "Failed to set OPP config\n");
+               goto fail_put_node;
        }
 
        of_node_put(opp_data->opp_node);
+
 register_cpufreq_dt:
        platform_device_register_simple("cpufreq-dt", -1, NULL, 0);