From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 14 May 2018 21:12:48 +0000 (+0200)
Subject: Merge branch 'opp/genpd-pstate-updates' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8ad17c8eb1b57f2395e2a9e43b71665d89de4f34;p=linux.git

Merge branch 'opp/genpd-pstate-updates' of git://git./linux/kernel/git/vireshk/pm

Pull Operating Performance Points (OPP) library changes for v4.18
from Viresh Kumar.

* 'opp/genpd-pstate-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
  PM / OPP: Remove dev_pm_opp_{un}register_get_pstate_helper()
  PM / OPP: Get performance state using genpd helper
  PM / Domain: Implement of_genpd_opp_to_performance_state()
  PM / Domain: Add support to parse domain's OPP table
  PM / Domain: Add struct device to genpd
  PM / OPP: Implement dev_pm_opp_get_of_node()
  PM / OPP: Implement of_dev_pm_opp_find_required_opp()
  PM / OPP: Implement dev_pm_opp_of_add_table_indexed()
  PM / OPP: "opp-hz" is optional for power domains
  PM / OPP: dt-bindings: Make "opp-hz" optional for power domains
  PM / OPP: dt-bindings: Rename "required-opp" as "required-opps"
  soc/tegra: pmc: Don't allocate struct tegra_powergate on stack
---

8ad17c8eb1b57f2395e2a9e43b71665d89de4f34
diff --cc include/linux/pm_domain.h
index ab1854863a8c0,a2fa297e96f73..4e5764083fd83
--- a/include/linux/pm_domain.h
+++ b/include/linux/pm_domain.h
@@@ -278,9 -284,16 +284,16 @@@ static inline int of_genpd_parse_idle_s
  	return -ENODEV;
  }
  
+ static inline unsigned int
+ of_genpd_opp_to_performance_state(struct device *dev,
+ 				  struct device_node *opp_node)
+ {
+ 	return -ENODEV;
+ }
+ 
  static inline int genpd_dev_pm_attach(struct device *dev)
  {
 -	return -ENODEV;
 +	return 0;
  }
  
  static inline