From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 12 Dec 2016 19:44:01 +0000 (+0100)
Subject: Merge branch 'pm-opp'
X-Git-Tag: v4.10-rc1~152^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57def856f33a5b50c71d3d40faf73d00b034e29c;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'pm-opp'

* pm-opp:
  PM / OPP: Don't WARN on multiple calls to dev_pm_opp_set_regulators()
  PM / OPP: Allow platform specific custom set_opp() callbacks
  PM / OPP: Separate out _generic_set_opp()
  PM / OPP: Add infrastructure to manage multiple regulators
  PM / OPP: Pass struct dev_pm_opp_supply to _set_opp_voltage()
  PM / OPP: Manage supply's voltage/current in a separate structure
  PM / OPP: Don't use OPP structure outside of rcu protected section
  PM / OPP: Reword binding supporting multiple regulators per device
  PM / OPP: Fix incorrect cpu-supply property in binding
  PM / OPP: Pass opp_table to dev_pm_opp_put_regulator()
  PM / OPP: fix debug/error messages in dev_pm_opp_of_get_sharing_cpus()
  PM / OPP: make _of_get_opp_desc_node() a static function
---

57def856f33a5b50c71d3d40faf73d00b034e29c