Commit a17a733e 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.10-rc1 from Viresh Kumar:

"- STI cpufreq driver updates to allow new hardware (Alain Volmat).

 - Minor tegra driver fixes around initial frequency mismatch warnings (Jon
   Hunter).

 - dev_err simplification for s5pv210 driver (Krzysztof Kozlowski).

 - Qcom driver updates to allow new hardware and minor cleanup (Manivannan
   Sadhasivam and Matthias Kaehlcke).

 - Add missing MODULE_DEVICE_TABLE for armada driver (Pali Rohár).

 - Improved defer-probe handling in cpufreq-dt driver (Stephan Gerhold).

 - Call dev_pm_opp_of_remove_table() unconditionally for imx driver (Viresh
   Kumar)."

* 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
  cpufreq: qcom: Don't add frequencies without an OPP
  cpufreq: qcom-hw: Add cpufreq support for SM8250 SoC
  cpufreq: qcom-hw: Use of_device_get_match_data for offsets and row size
  cpufreq: qcom-hw: Use devm_platform_ioremap_resource() to simplify code
  dt-bindings: cpufreq: cpufreq-qcom-hw: Document Qcom EPSS compatible
  cpufreq: qcom-hw: Make use of cpufreq driver_data for passing pdev
  cpufreq: armada-37xx: Add missing MODULE_DEVICE_TABLE
  cpufreq: arm: Kconfig: add CPUFREQ_DT depend for STI CPUFREQ
  cpufreq: dt-platdev: Blacklist st,stih418 SoC
  cpufreq: sti-cpufreq: add stih418 support
  cpufreq: s5pv210: Use dev_err instead of pr_err in probe
  cpufreq: s5pv210: Simplify with dev_err_probe()
  cpufreq: tegra186: Fix initial frequency
  cpufreq: dt: Refactor initialization to handle probe deferral properly
  opp: Handle multiple calls for same OPP table in _of_add_opp_table_v1()
  cpufreq: imx6q: Unconditionally call dev_pm_opp_of_remove_table()
  opp: Allow dev_pm_opp_get_opp_table() to return -EPROBE_DEFER
parents 08d8c65e bc9b9c5a

Documentation/devicetree/bindings/cpufreq/cpufreq-qcom-hw.txt

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Properties: 
- compatible

	Usage:		required

	Value type:	<string>

	Definition:	must be "qcom,cpufreq-hw".

	Definition:	must be "qcom,cpufreq-hw" or "qcom,cpufreq-epss".



- clocks

	Usage:		required

drivers/base/power/domain.c

+8 −6
Original line number Diff line number Diff line
@@ -2044,6 +2044,7 @@ int of_genpd_add_provider_simple(struct device_node *np, 
	if (genpd->set_performance_state) {

		ret = dev_pm_opp_of_add_table(&genpd->dev);

		if (ret) {

			if (ret != -EPROBE_DEFER)

				dev_err(&genpd->dev, "Failed to add OPP table: %d\n",

					ret);

			goto unlock;
@@ -2054,7 +2055,7 @@ int of_genpd_add_provider_simple(struct device_node *np, 
		 * state.

		 */

		genpd->opp_table = dev_pm_opp_get_opp_table(&genpd->dev);

		WARN_ON(!genpd->opp_table);

		WARN_ON(IS_ERR(genpd->opp_table));

	}



	ret = genpd_add_provider(np, genpd_xlate_simple, genpd);
@@ -2111,6 +2112,7 @@ int of_genpd_add_provider_onecell(struct device_node *np, 
		if (genpd->set_performance_state) {

			ret = dev_pm_opp_of_add_table_indexed(&genpd->dev, i);

			if (ret) {

				if (ret != -EPROBE_DEFER)

					dev_err(&genpd->dev, "Failed to add OPP table for index %d: %d\n",

						i, ret);

				goto error;
@@ -2121,7 +2123,7 @@ int of_genpd_add_provider_onecell(struct device_node *np, 
			 * performance state.

			 */

			genpd->opp_table = dev_pm_opp_get_opp_table_indexed(&genpd->dev, i);

			WARN_ON(!genpd->opp_table);

			WARN_ON(IS_ERR(genpd->opp_table));

		}



		genpd->provider = &np->fwnode;

drivers/cpufreq/Kconfig.arm

+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ config ARM_SPEAR_CPUFREQ 


config ARM_STI_CPUFREQ

	tristate "STi CPUFreq support"

	depends on SOC_STIH407

	depends on CPUFREQ_DT && SOC_STIH407

	help

	  This driver uses the generic OPP framework to match the running

	  platform with a predefined set of suitable values.  If not provided

drivers/cpufreq/armada-37xx-cpufreq.c

+6 −0
Original line number Diff line number Diff line
@@ -484,6 +484,12 @@ remove_opp: 
/* late_initcall, to guarantee the driver is loaded after A37xx clock driver */

late_initcall(armada37xx_cpufreq_driver_init);



static const struct of_device_id __maybe_unused armada37xx_cpufreq_of_match[] = {

	{ .compatible = "marvell,armada-3700-nb-pm" },

	{ },

};

MODULE_DEVICE_TABLE(of, armada37xx_cpufreq_of_match);



MODULE_AUTHOR("Gregory CLEMENT <gregory.clement@free-electrons.com>");

MODULE_DESCRIPTION("Armada 37xx cpufreq driver");

MODULE_LICENSE("GPL");

drivers/cpufreq/cpufreq-dt-platdev.c

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ static const struct of_device_id blacklist[] __initconst = { 


	{ .compatible = "st,stih407", },

	{ .compatible = "st,stih410", },

	{ .compatible = "st,stih418", },



	{ .compatible = "sigma,tango4", },

CRA Git | Maintained and supported by SUSTech CRA and CCSE