From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 15 Dec 2020 14:27:16 +0000 (+0100)
Subject: Merge branches 'pm-devfreq' and 'pm-tools'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b3fac817830306328d5195e7f4fb332277f3b146;p=linux.git

Merge branches 'pm-devfreq' and 'pm-tools'

* pm-devfreq:
  PM / devfreq: tegra30: Separate configurations per-SoC generation
  PM / devfreq: tegra30: Support interconnect and OPPs from device-tree
  PM / devfreq: tegra20: Deprecate in a favor of emc-stat based driver
  PM / devfreq: exynos-bus: Add registration of interconnect child device
  dt-bindings: devfreq: Add documentation for the interconnect properties
  soc/tegra: fuse: Add stub for tegra_sku_info
  soc/tegra: fuse: Export tegra_read_ram_code()
  clk: tegra: Export Tegra20 EMC kernel symbols
  PM / devfreq: tegra30: Silence deferred probe error
  PM / devfreq: tegra20: Relax Kconfig dependency
  PM / devfreq: tegra20: Silence deferred probe error
  PM / devfreq: Remove redundant governor_name from struct devfreq
  PM / devfreq: Add governor attribute flag for specifc sysfs nodes
  PM / devfreq: Add governor feature flag
  PM / devfreq: Add tracepoint for frequency changes
  PM / devfreq: Unify frequency change to devfreq_update_target func
  trace: events: devfreq: Use fixed indentation size to improve readability

* pm-tools:
  pm-graph v5.8
  cpupower: Provide online and offline CPU information
---

b3fac817830306328d5195e7f4fb332277f3b146
diff --cc drivers/devfreq/exynos-bus.c
index 143fd58ec3dcb,20447a401af43,1e684a448c9ef..e689101abc930
--- a/drivers/devfreq/exynos-bus.c
+++ b/drivers/devfreq/exynos-bus.c
@@@@ -156,10 -157,14 -156,12 +157,12 @@@@ static void exynos_bus_exit(struct devi
   	if (ret < 0)
   		dev_warn(dev, "failed to disable the devfreq-event devices\n");
   
+ +	platform_device_unregister(bus->icc_pdev);
+ +
   	dev_pm_opp_of_remove_table(dev);
   	clk_disable_unprepare(bus->clk);
 --	if (bus->opp_table) {
 --		dev_pm_opp_put_regulators(bus->opp_table);
 --		bus->opp_table = NULL;
 --	}
 ++	dev_pm_opp_put_regulators(bus->opp_table);
 ++	bus->opp_table = NULL;
   }
   
   static void exynos_bus_passive_exit(struct device *dev)