Commit 7ad9eab9 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge tag 'cpufreq-arm-updates-6.11' of... 

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

Merge ARM cpufreq updates for 6.11 from Viresh Kumar:

"- cpufreq: Add Loongson-3 CPUFreq driver support (Huacai Chen).
 - Make exit() callback return void (Lizhe and Viresh Kumar).
 - Minor cleanups and fixes in several drivers (Bryan Brattlof,
   Javier Carrasco, Jagadeesh Kona, Jeff Johnson, Nícolas F. R. A. Prado,
   Primoz Fiser, Raphael Gallais-Pou, and Riwen Lu)."

* tag 'cpufreq-arm-updates-6.11' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/vireshk/pm: (21 commits)
  cpufreq: sti: fix build warning
  cpufreq: mediatek: Use dev_err_probe in every error path in probe
  cpufreq: Add Loongson-3 CPUFreq driver support
  cpufreq: Make cpufreq_driver->exit() return void
  cpufreq: pcc: Remove empty exit() callback
  cpufreq: loongson2: Remove empty exit() callback
  cpufreq: nforce2: Remove empty exit() callback
  cpufreq: sti: add missing MODULE_DEVICE_TABLE entry for stih418
  cpufreq: ti: update OPP table for AM62Px SoCs
  cpufreq: ti: update OPP table for AM62Ax SoCs
  cpufreq: sun50i: add Allwinner H700 speed bin
  cpufreq/cppc: Don't compare desired_perf in target()
  OPP: ti: Fix ti_opp_supply_probe wrong return values
  cpufreq: ti-cpufreq: Handle deferred probe with dev_err_probe()
  cpufreq: dt-platdev: add missing MODULE_DESCRIPTION() macro
  cpufreq: longhaul: Fix kernel-doc param for longhaul_setstate
  cpufreq: qcom-nvmem: eliminate uses of of_node_put()
  cpufreq: qcom-nvmem: fix memory leaks in probe error paths
  cpufreq: scmi: Avoid overflow of target_freq in fast switch
  cpufreq: sun50i: replace of_node_put() with automatic cleanup handler
  ...
parents e23f41cc d992f881

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -12967,6 +12967,7 @@ F: Documentation/arch/loongarch/ 
F:	Documentation/translations/zh_CN/arch/loongarch/

F:	arch/loongarch/

F:	drivers/*/*loongarch*

F:	drivers/cpufreq/loongson3_cpufreq.c









LOONGSON GPIO DRIVER









M:	Yinbo Zhu <zhuyinbo@loongson.cn>
































drivers/cpufreq/Kconfig



+12
−0






























Original line number
Diff line number
Diff line







@@ -262,6 +262,18 @@ config LOONGSON2_CPUFREQ







	  If in doubt, say N.









endif



















if LOONGARCH









config LOONGSON3_CPUFREQ









	tristate "Loongson3 CPUFreq Driver"









	help









	  This option adds a CPUFreq driver for Loongson processors which









	  support software configurable cpu frequency.



















	  Loongson-3 family processors support this feature.



















	  If in doubt, say N.









endif



















if SPARC64









config SPARC_US3_CPUFREQ









	tristate "UltraSPARC-III CPU Frequency driver"
































drivers/cpufreq/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -103,6 +103,7 @@ obj-$(CONFIG_POWERNV_CPUFREQ)		+= powernv-cpufreq.o







# Other platform drivers









obj-$(CONFIG_BMIPS_CPUFREQ)		+= bmips-cpufreq.o









obj-$(CONFIG_LOONGSON2_CPUFREQ)		+= loongson2_cpufreq.o









obj-$(CONFIG_LOONGSON3_CPUFREQ)		+= loongson3_cpufreq.o









obj-$(CONFIG_SH_CPU_FREQ)		+= sh-cpufreq.o









obj-$(CONFIG_SPARC_US2E_CPUFREQ)	+= sparc-us2e-cpufreq.o









obj-$(CONFIG_SPARC_US3_CPUFREQ)		+= sparc-us3-cpufreq.o
























drivers/cpufreq/acpi-cpufreq.c



+1
−3






























Original line number
Diff line number
Diff line







@@ -904,7 +904,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)







	return result;









}



















static int acpi_cpufreq_cpu_exit(struct cpufreq_policy *policy)









static void acpi_cpufreq_cpu_exit(struct cpufreq_policy *policy)









{









	struct acpi_cpufreq_data *data = policy->driver_data;


















@@ -917,8 +917,6 @@ static int acpi_cpufreq_cpu_exit(struct cpufreq_policy *policy)







	free_cpumask_var(data->freqdomain_cpus);









	kfree(policy->freq_table);









	kfree(data);



















	return 0;









}



















static int acpi_cpufreq_resume(struct cpufreq_policy *policy)
































drivers/cpufreq/amd-pstate.c



+2
−5






























Original line number
Diff line number
Diff line







@@ -1093,7 +1093,7 @@ static int amd_pstate_cpu_init(struct cpufreq_policy *policy)







	return ret;









}



















static int amd_pstate_cpu_exit(struct cpufreq_policy *policy)









static void amd_pstate_cpu_exit(struct cpufreq_policy *policy)









{









	struct amd_cpudata *cpudata = policy->driver_data;


















@@ -1101,8 +1101,6 @@ static int amd_pstate_cpu_exit(struct cpufreq_policy *policy)







	freq_qos_remove_request(&cpudata->req[0]);









	policy->fast_switch_possible = false;









	kfree(cpudata);



















	return 0;









}



















static int amd_pstate_cpu_resume(struct cpufreq_policy *policy)








@@ -1545,7 +1543,7 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy)







	return ret;









}



















static int amd_pstate_epp_cpu_exit(struct cpufreq_policy *policy)









static void amd_pstate_epp_cpu_exit(struct cpufreq_policy *policy)









{









	struct amd_cpudata *cpudata = policy->driver_data;


















@@ -1555,7 +1553,6 @@ static int amd_pstate_epp_cpu_exit(struct cpufreq_policy *policy)







	}



















	pr_debug("CPU %d exiting\n", policy->cpu);









	return 0;









}



















static void amd_pstate_epp_update_limit(struct cpufreq_policy *policy)