aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Gerlach <d-gerlach@ti.com>2016-09-23 16:07:47 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-09-26 09:13:31 -0400
commita4ee4545932d4b26ec0c190f2ce265de79990c7a (patch)
treea155c293f5c7faf7e5f26ce032df2a4a2ace89ab
parent4df27c91893fd13eaa30e9b0bca74f317816f428 (diff)
PM / OPP: Don't support OPP if it provides supported-hw but platform does not
The OPP framework allows each OPP to set a opp-supported-hw property which provides values that are matched against supported_hw values provided by the platform to limit support for certain OPPs on specific hardware. Currently, if the platform does not set supported_hw values, all OPPs are interpreted as supported, even if they have provided their own opp-supported-hw values. If an OPP has provided opp-supported-hw, it is indicating that there is some specific hardware configuration it is supported by. These constraints should be honored, and if no supported_hw has been provided by the platform, there is no way to determine if that OPP is actually supported, so it should be marked as not supported. Signed-off-by: Dave Gerlach <d-gerlach@ti.com> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/base/power/opp/of.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/base/power/opp/of.c b/drivers/base/power/opp/of.c
index 1dfd3dd92624..5552211e6fcd 100644
--- a/drivers/base/power/opp/of.c
+++ b/drivers/base/power/opp/of.c
@@ -71,8 +71,18 @@ static bool _opp_is_supported(struct device *dev, struct opp_table *opp_table,
71 u32 version; 71 u32 version;
72 int ret; 72 int ret;
73 73
74 if (!opp_table->supported_hw) 74 if (!opp_table->supported_hw) {
75 return true; 75 /*
76 * In the case that no supported_hw has been set by the
77 * platform but there is an opp-supported-hw value set for
78 * an OPP then the OPP should not be enabled as there is
79 * no way to see if the hardware supports it.
80 */
81 if (of_find_property(np, "opp-supported-hw", NULL))
82 return false;
83 else
84 return true;
85 }
76 86
77 while (count--) { 87 while (count--) {
78 ret = of_property_read_u32_index(np, "opp-supported-hw", count, 88 ret = of_property_read_u32_index(np, "opp-supported-hw", count,