Commit 30c76882 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm 

Pull ARM cpufreq updates for 5.11-rc1 from Viresh Kumar:

"This contains the following updates:

 - Fix imx's NVMEM_IMX_OCOTP dependency (Arnd Bergmann).

 - Add support for mt8167 and blacklist mt8516 (Fabien Parent).

 - Some ->get() callback related cleanups to the tegra194 driver and
   some optimizations in tegra186 driver (Jon Hunter and Sumit Gupta).

 - Power scale improvements to arm_scmi driver (Lukasz Luba).

 - Add missing MODULE_DEVICE_TABLE and MODULE_ALIAS to several drivers
   (Pali Rohár).

 - Fix error path in mediatek driver (Qinglang Miao).

 - Fix memleak in ST's cpufreq driver (Yangtao Li)."

* 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm: (22 commits)
  cpufreq: arm_scmi: Discover the power scale in performance protocol
  firmware: arm_scmi: Add power_scale_mw_get() interface
  cpufreq: tegra194: Rename tegra194_get_speed_common function
  cpufreq: tegra194: Remove unnecessary frequency calculation
  cpufreq: tegra186: Simplify cluster information lookup
  cpufreq: tegra186: Fix sparse 'incorrect type in assignment' warning
  cpufreq: imx: fix NVMEM_IMX_OCOTP dependency
  cpufreq: vexpress-spc: Add missing MODULE_ALIAS
  cpufreq: scpi: Add missing MODULE_ALIAS
  cpufreq: loongson1: Add missing MODULE_ALIAS
  cpufreq: sun50i: Add missing MODULE_DEVICE_TABLE
  cpufreq: st: Add missing MODULE_DEVICE_TABLE
  cpufreq: qcom: Add missing MODULE_DEVICE_TABLE
  cpufreq: mediatek: Add missing MODULE_DEVICE_TABLE
  cpufreq: highbank: Add missing MODULE_DEVICE_TABLE
  cpufreq: ap806: Add missing MODULE_DEVICE_TABLE
  cpufreq: mediatek: add missing platform_driver_unregister() on error in mtk_cpufreq_driver_init
  cpufreq: tegra194: get consistent cpuinfo_cur_freq
  cpufreq: blacklist mt8516 in cpufreq-dt-platdev
  cpufreq: mediatek: Add support for mt8167
  ...
parents b96f0384 c8bb4520

drivers/cpufreq/Kconfig.arm

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ config ARM_IMX6Q_CPUFREQ 
	tristate "Freescale i.MX6 cpufreq support"

	depends on ARCH_MXC

	depends on REGULATOR_ANATOP

	select NVMEM_IMX_OCOTP

	depends on NVMEM_IMX_OCOTP || COMPILE_TEST

	select PM_OPP

	help

	  This adds cpufreq driver support for Freescale i.MX6 series SoCs.

drivers/cpufreq/armada-8k-cpufreq.c

+6 −0
Original line number Diff line number Diff line
@@ -204,6 +204,12 @@ static void __exit armada_8k_cpufreq_exit(void) 
}

module_exit(armada_8k_cpufreq_exit);



static const struct of_device_id __maybe_unused armada_8k_cpufreq_of_match[] = {

	{ .compatible = "marvell,ap806-cpu-clock" },

	{ },

};

MODULE_DEVICE_TABLE(of, armada_8k_cpufreq_of_match);



MODULE_AUTHOR("Gregory Clement <gregory.clement@bootlin.com>");

MODULE_DESCRIPTION("Armada 8K cpufreq driver");

MODULE_LICENSE("GPL");

drivers/cpufreq/cpufreq-dt-platdev.c

+2 −0
Original line number Diff line number Diff line
@@ -119,10 +119,12 @@ static const struct of_device_id blacklist[] __initconst = { 
	{ .compatible = "mediatek,mt2712", },

	{ .compatible = "mediatek,mt7622", },

	{ .compatible = "mediatek,mt7623", },

	{ .compatible = "mediatek,mt8167", },

	{ .compatible = "mediatek,mt817x", },

	{ .compatible = "mediatek,mt8173", },

	{ .compatible = "mediatek,mt8176", },

	{ .compatible = "mediatek,mt8183", },

	{ .compatible = "mediatek,mt8516", },



	{ .compatible = "nvidia,tegra20", },

	{ .compatible = "nvidia,tegra30", },

drivers/cpufreq/highbank-cpufreq.c

+7 −0
Original line number Diff line number Diff line
@@ -101,6 +101,13 @@ out_put_node: 
}

module_init(hb_cpufreq_driver_init);



static const struct of_device_id __maybe_unused hb_cpufreq_of_match[] = {

	{ .compatible = "calxeda,highbank" },

	{ .compatible = "calxeda,ecx-2000" },

	{ },

};

MODULE_DEVICE_TABLE(of, hb_cpufreq_of_match);



MODULE_AUTHOR("Mark Langsdorf <mark.langsdorf@calxeda.com>");

MODULE_DESCRIPTION("Calxeda Highbank cpufreq driver");

MODULE_LICENSE("GPL");

drivers/cpufreq/loongson1-cpufreq.c

+1 −0
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ static struct platform_driver ls1x_cpufreq_platdrv = { 


module_platform_driver(ls1x_cpufreq_platdrv);



MODULE_ALIAS("platform:ls1x-cpufreq");

MODULE_AUTHOR("Kelvin Cheung <keguang.zhang@gmail.com>");

MODULE_DESCRIPTION("Loongson1 CPUFreq driver");

MODULE_LICENSE("GPL");

CRA Git | Maintained and supported by SUSTech CRA and CCSE