OPP: Track if clock name is configured by platform

Track if the clock name is configured by the platform or not. This is a
preparatory change and will be used by later commits. This also makes
the behavior of the clkname API similar to other ones, which allow
repeated calls to the same API for each CPU.

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

diff --git a/drivers/opp/core.c b/drivers/opp/core.c
index b2715950e76d245728fd893a4c4ac6293a7c8ed9..e166bfe5fc90c40134211ba87ab5ff112f7b996c 100644 (file)
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@ -2277,6 +2277,10 @@ struct opp_table *dev_pm_opp_set_clkname(struct device *dev, const char *name)
                goto err;
        }
 
+       /* Another CPU that shares the OPP table has set the clkname ? */
+       if (opp_table->clk_configured)
+               return opp_table;
+
        /* clk shouldn't be initialized at this point */
        if (WARN_ON(opp_table->clk)) {
                ret = -EBUSY;
@@ -2291,6 +2295,8 @@ struct opp_table *dev_pm_opp_set_clkname(struct device *dev, const char *name)
                goto err;
        }
 
+       opp_table->clk_configured = true;
+
        return opp_table;
 
 err:
@@ -2311,6 +2317,7 @@ void dev_pm_opp_put_clkname(struct opp_table *opp_table)
 
        clk_put(opp_table->clk);
        opp_table->clk = ERR_PTR(-EINVAL);
+       opp_table->clk_configured = false;
 
        dev_pm_opp_put_opp_table(opp_table);
 }

diff --git a/drivers/opp/opp.h b/drivers/opp/opp.h
index 45e3a55239a13aef5a971a7e7a170958e0144423..9e1cfcb0ea98417522647ee15aa70fb5c75f634c 100644 (file)
--- a/drivers/opp/opp.h
+++ b/drivers/opp/opp.h
@@ -149,6 +149,7 @@ enum opp_table_access {
  * @supported_hw: Array of version number to support.
  * @supported_hw_count: Number of elements in supported_hw array.
  * @prop_name: A name to postfix to many DT properties, while parsing them.
+ * @clk_configured: Clock name is configured by the platform.
  * @clk: Device's clock handle
  * @regulators: Supply regulators
  * @regulator_count: Number of power supply regulators. Its value can be -1
@@ -200,6 +201,7 @@ struct opp_table {
        unsigned int *supported_hw;
        unsigned int supported_hw_count;
        const char *prop_name;
+       bool clk_configured;
        struct clk *clk;
        struct regulator **regulators;
        int regulator_count;