diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-07-04 18:26:44 +0200 | 
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-07-04 18:26:44 +0200 | 
| commit | 40c565a429d706951f18fe07ccd9f6fded23a4dc (patch) | |
| tree | e5b0182f06a04620b317d468f461dda010294672 /tools/testing/selftests/bpf/prog_tests/autoload.c | |
| parent | bb814518bf7c2d6c0468a39153de222e0400e3a4 (diff) | |
| parent | 0fcfc9e51990246a9813475716746ff5eb98c6aa (diff) | |
| parent | b2918089d5cb452e928ad9f86c5ee601c592cee3 (diff) | |
Merge branches 'pm-cpufreq' and 'pm-cpuidle'
Merge CPU power management updates for 6.5-rc1:
 - Add missing __init annotation to one function in the intel_idle
   drvier (Rafael Wysocki).
 - Make intel_pstate use a correct scaling factor when mapping HWP
   performance levels to frequency values on hybrid-capable systems
   with disabled E-cores (Srinivas Pandruvada).
 - Fix Kconfig dependencies of the cpufreq-dt-platform driver (Viresh
   Kumar).
 - Add support to build cpufreq-dt-platdev as a module (Zhipeng Wang).
 - Don't allocate Sparc's cpufreq_driver dynamically (Viresh Kumar).
 - Add support for TI's AM62A7 platform (Vibhore Vardhan).
 - Add support for Armada's ap807 platform (Russell King (Oracle)).
 - Add support for StarFive JH7110 SoC (Mason Huo).
 - Fix voltage selection for Mediatek Socs (Daniel Golle).
 - Fix error handling in Tegra's cpufreq driver (Christophe JAILLET).
 - Document Qualcomm's IPQ8074 in DT bindings (Robert Marko).
 - Don't warn for disabling a non-existing frequency for imx6q cpufreq
   driver (Christoph Niedermaier).
 - Use dev_err_probe() in Qualcomm's cpufreq driver (Andrew Halaney).
* pm-cpufreq:
  cpufreq: intel_pstate: Fix scaling for hybrid-capable systems with disabled E-cores
  cpufreq: Make CONFIG_CPUFREQ_DT_PLATDEV depend on OF
  cpufreq: qcom-cpufreq-hw: Use dev_err_probe() when failing to get icc paths
  cpufreq: mediatek: correct voltages for MT7622 and MT7623
  cpufreq: armada-8k: add ap807 support
  cpufreq: dt-platdev: Support building as module
  dt-bindings: cpufreq: qcom-cpufreq-nvmem: document IPQ8074
  cpufreq: dt-platdev: Blacklist ti,am62a7 SoC
  cpufreq: ti-cpufreq: Add support for AM62A7
  cpufreq: imx6q: don't warn for disabling a non-existing frequency
  cpufreq: sparc: Don't allocate cpufreq_driver dynamically
  cpufreq: tegra194: Fix an error handling path in tegra194_cpufreq_probe()
  cpufreq: dt-platdev: Add JH7110 SOC to the allowlist
* pm-cpuidle:
  intel_idle: Add __init annotation to matchup_vm_state_with_baremetal()
