From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Jun 2020 21:04:39 +0000 (-0700)
Subject: Merge tag 'pm-5.8-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: v5.10.7~2367
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0c67f6b29715ff888cb967cc98336221a8a23916;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'pm-5.8-rc1-2' of git://git./linux/kernel/git/rafael/linux-pm

Pull more power management updates from Rafael Wysocki:
 "These are operating performance points (OPP) framework updates mostly,
  including support for interconnect bandwidth in the OPP core, plus a
  few cpufreq changes, including boost support in the CPPC cpufreq
  driver, an ACPI device power management fix and a hibernation code
  cleanup.

  Specifics:

   - Add support for interconnect bandwidth to the OPP core (Georgi
     Djakov, Saravana Kannan, Sibi Sankar, Viresh Kumar).

   - Add support for regulator enable/disable to the OPP core (Kamil
     Konieczny).

   - Add boost support to the CPPC cpufreq driver (Xiongfeng Wang).

   - Make the tegra186 cpufreq driver set the
     CPUFREQ_NEED_INITIAL_FREQ_CHECK flag (Mian Yousaf Kaukab).

   - Prevent the ACPI power management from using power resources with
     devices where the list of power resources for power state D0 (full
     power) is missing (Rafael Wysocki).

   - Annotate a hibernation-related function with __init (Christophe
     JAILLET)"

* tag 'pm-5.8-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: PM: Avoid using power resources if there are none for D0
  cpufreq: CPPC: add SW BOOST support
  cpufreq: change '.set_boost' to act on one policy
  PM: hibernate: Add __init annotation to swsusp_header_init()
  opp: Don't parse icc paths unnecessarily
  opp: Remove bandwidth votes when target_freq is zero
  opp: core: add regulators enable and disable
  opp: Reorder the code for !target_freq case
  opp: Expose bandwidth information via debugfs
  cpufreq: dt: Add support for interconnect bandwidth scaling
  opp: Update the bandwidth on OPP frequency changes
  opp: Add sanity checks in _read_opp_key()
  opp: Add support for parsing interconnect bandwidth
  cpufreq: tegra186: add CPUFREQ_NEED_INITIAL_FREQ_CHECK flag
  OPP: Add helpers for reading the binding properties
  dt-bindings: opp: Introduce opp-peak-kBps and opp-avg-kBps bindings
---

0c67f6b29715ff888cb967cc98336221a8a23916
diff --cc include/linux/interconnect.h
index d8c29049f066,1ad09efd296e..3a63d98613fc
--- a/include/linux/interconnect.h
+++ b/include/linux/interconnect.h
@@@ -28,13 -28,11 +28,14 @@@ struct device
  struct icc_path *icc_get(struct device *dev, const int src_id,
  			 const int dst_id);
  struct icc_path *of_icc_get(struct device *dev, const char *name);
 +struct icc_path *devm_of_icc_get(struct device *dev, const char *name);
  struct icc_path *of_icc_get_by_index(struct device *dev, int idx);
  void icc_put(struct icc_path *path);
 +int icc_enable(struct icc_path *path);
 +int icc_disable(struct icc_path *path);
  int icc_set_bw(struct icc_path *path, u32 avg_bw, u32 peak_bw);
  void icc_set_tag(struct icc_path *path, u32 tag);
+ const char *icc_get_name(struct icc_path *path);
  
  #else