Commit 4d99175a 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 drivers updates for v5.7 from Viresh Kumar:

"This pull request contains:

 - update to imx cpufreq drivers to improve their support (Anson Huang,
   Christoph Niedermaier, and Peng Fan).

 - Update to qcom cpufreq to support other krait based SoCs (Ansuel
   Smith).

 - Update ti cpufreq driver to support OPP_PLUS (Lokesh Vutla).

 - Update cpufreq-dt driver to allow platfoem specific intermediate
   callbacks (Peng Fan)."

* 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
  cpufreq: qcom: Add support for krait based socs
  cpufreq: imx6q-cpufreq: Improve the logic of -EPROBE_DEFER handling
  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 3c0897c1 a8811ec7

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);

drivers/cpufreq/cpufreq-dt.h

+4 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ struct cpufreq_policy; 
struct cpufreq_dt_platform_data {

	bool have_governor_per_policy;



	unsigned int	(*get_intermediate)(struct cpufreq_policy *policy,

					    unsigned int index);

	int		(*target_intermediate)(struct cpufreq_policy *policy,

					       unsigned int index);

	int (*suspend)(struct cpufreq_policy *policy);

	int (*resume)(struct cpufreq_policy *policy);

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE