Commit 6b7195d3 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge tag 'cpufreq-arm-updates-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm 

Merge ARM cpufreq updates for 6.9 from Viresh Kumar:

"- General enhancements / cleanups to cpufreq drivers (tianyu2, Nícolas
   F. R. A. Prado, Erick Archer, Arnd Bergmann, Anastasia Belova).
 - Update cpufreq-dt-platdev to block/approve devices (Richard Acayan).
 - scmi: get transition delay from firmware (Pierre Gondois)."

* tag 'cpufreq-arm-updates-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
  cpufreq: scmi: Set transition_delay_us
  firmware: arm_scmi: Populate fast channel rate_limit
  firmware: arm_scmi: Populate perf commands rate_limit
  cpufreq: qcom-hw: add CONFIG_COMMON_CLK dependency
  cpufreq: dt-platdev: block SDM670 in cpufreq-dt-platdev
  cpufreq: mediatek-hw: Don't error out if supply is not found
  Documentation: power: Use kcalloc() instead of kzalloc()
  cpufreq: mediatek-hw: Wait for CPU supplies before probing
  cpufreq: brcmstb-avs-cpufreq: add check for cpufreq_cpu_get's return value
  cpufreq: imx6: use regmap to read ocotp register
parents e4d0d7f1 ad2a9108

Documentation/power/opp.rst

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ dev_pm_opp_get_opp_count 
	 {

		/* Do things */

		num_available = dev_pm_opp_get_opp_count(dev);

		speeds = kzalloc(sizeof(u32) * num_available, GFP_KERNEL);

		speeds = kcalloc(num_available, sizeof(u32), GFP_KERNEL);

		/* populate the table in increasing order */

		freq = 0;

		while (!IS_ERR(opp = dev_pm_opp_find_freq_ceil(dev, &freq))) {

Documentation/translations/zh_CN/power/opp.rst

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ dev_pm_opp_get_opp_count 
	 {

		/* 做一些事情 */

		num_available = dev_pm_opp_get_opp_count(dev);

		speeds = kzalloc(sizeof(u32) * num_available, GFP_KERNEL);

		speeds = kcalloc(num_available, sizeof(u32), GFP_KERNEL);

		/* 按升序填充表 */

		freq = 0;

		while (!IS_ERR(opp = dev_pm_opp_find_freq_ceil(dev, &freq))) {

drivers/cpufreq/Kconfig.arm

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ config ARM_QCOM_CPUFREQ_NVMEM 
config ARM_QCOM_CPUFREQ_HW

	tristate "QCOM CPUFreq HW driver"

	depends on ARCH_QCOM || COMPILE_TEST

	depends on COMMON_CLK

	help

	  Support for the CPUFreq HW driver.

	  Some QCOM chipsets have a HW engine to offload the steps

drivers/cpufreq/brcmstb-avs-cpufreq.c

+2 −0
Original line number Diff line number Diff line
@@ -481,6 +481,8 @@ static bool brcm_avs_is_firmware_loaded(struct private_data *priv) 
static unsigned int brcm_avs_cpufreq_get(unsigned int cpu)

{

	struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);

	if (!policy)

		return 0;

	struct private_data *priv = policy->driver_data;



	cpufreq_cpu_put(policy);

drivers/cpufreq/cpufreq-dt-platdev.c

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ static const struct of_device_id blocklist[] __initconst = { 
	{ .compatible = "qcom,sc7280", },

	{ .compatible = "qcom,sc8180x", },

	{ .compatible = "qcom,sc8280xp", },

	{ .compatible = "qcom,sdm670", },

	{ .compatible = "qcom,sdm845", },

	{ .compatible = "qcom,sdx75", },

	{ .compatible = "qcom,sm6115", },