Commit 0411f0d1 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-cpufreq' 

* pm-cpufreq:
  cpufreq: intel_pstate: Simplify intel_pstate_cpu_init()
  cpufreq: qcom: Add support for krait based socs
  cpufreq: imx6q-cpufreq: Improve the logic of -EPROBE_DEFER handling
  cpufreq: Use scnprintf() for avoiding potential buffer overflow
  Documentation: intel_pstate: update links for references
  cpufreq: intel_pstate: Consolidate policy verification
  cpufreq: dt: Allow platform specific intermediate callbacks
  cpufreq: imx-cpufreq-dt: Correct i.MX8MP's market segment fuse location
  cpufreq: imx6q: read OCOTP through nvmem for imx6q
  cpufreq: imx6q: fix error handling
  cpufreq: imx-cpufreq-dt: Add "cpu-supply" property check
  cpufreq: ti-cpufreq: Add support for OPP_PLUS
  cpufreq: imx6q: Fixes unwanted cpu overclocking on i.MX6ULL
parents be4f6540 5ac54113

Documentation/admin-guide/pm/intel_pstate.rst

+2 −2
Original line number Diff line number Diff line
@@ -734,10 +734,10 @@ References 
==========



.. [1] Kristen Accardi, *Balancing Power and Performance in the Linux Kernel*,

       http://events.linuxfoundation.org/sites/events/files/slides/LinuxConEurope_2015.pdf

       https://events.static.linuxfound.org/sites/events/files/slides/LinuxConEurope_2015.pdf



.. [2] *Intel® 64 and IA-32 Architectures Software Developer’s Manual Volume 3: System Programming Guide*,

       http://www.intel.com/content/www/us/en/architecture-and-technology/64-ia-32-architectures-software-developer-system-programming-manual-325384.html

       https://www.intel.com/content/www/us/en/architecture-and-technology/64-ia-32-architectures-software-developer-system-programming-manual-325384.html



.. [3] *Advanced Configuration and Power Interface Specification*,

       https://uefi.org/sites/default/files/resources/ACPI_6_3_final_Jan30.pdf

Documentation/devicetree/bindings/opp/qcom-nvmem-cpufreq.txt

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ In 'cpu' nodes: 


In 'operating-points-v2' table:

- compatible: Should be

	- 'operating-points-v2-kryo-cpu' for apq8096 and msm8996.

	- 'operating-points-v2-kryo-cpu' for apq8096, msm8996, msm8974,

					     apq8064, ipq8064, msm8960 and ipq8074.



Optional properties:

--------------------

drivers/cpufreq/Kconfig.arm

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ config ARM_OMAP2PLUS_CPUFREQ 


config ARM_QCOM_CPUFREQ_NVMEM

	tristate "Qualcomm nvmem based CPUFreq"

	depends on ARM64

	depends on ARCH_QCOM

	depends on QCOM_QFPROM

	depends on QCOM_SMEM

	select PM_OPP

drivers/cpufreq/cpufreq-dt-platdev.c

+5 −0
Original line number Diff line number Diff line
@@ -141,6 +141,11 @@ static const struct of_device_id blacklist[] __initconst = { 
	{ .compatible = "ti,dra7", },

	{ .compatible = "ti,omap3", },



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

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

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

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



	{ }

};

drivers/cpufreq/cpufreq-dt.c

+4 −0
Original line number Diff line number Diff line
@@ -363,6 +363,10 @@ static int dt_cpufreq_probe(struct platform_device *pdev) 
		dt_cpufreq_driver.resume = data->resume;

		if (data->suspend)

			dt_cpufreq_driver.suspend = data->suspend;

		if (data->get_intermediate) {

			dt_cpufreq_driver.target_intermediate = data->target_intermediate;

			dt_cpufreq_driver.get_intermediate = data->get_intermediate;

		}

	}



	ret = cpufreq_register_driver(&dt_cpufreq_driver);

CRA Git | Maintained and supported by SUSTech CRA and CCSE