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

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

Merge tag 'cpufreq-arm-updates-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm into pm-cpufreq

Merge ARM cpufreq updates for 6.8 from Viresh Kumar:

"- Check return value of a function in SCMI cpufreq driver (Alexandra
   Diupina).
 - Use 'NULL' instead of '0' in Armada cpufreq driver (Gregory
   CLEMENT)."

* tag 'cpufreq-arm-updates-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
  cpufreq: armada-8k: Fix parameter type warning
  cpufreq: scmi: process the result of devm_of_clk_add_hw_provider()
parents e9501315 0990319a

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

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static void __init armada_8k_get_sharing_cpus(struct clk *cur_clk, 
			continue;

		}



		clk = clk_get(cpu_dev, 0);

		clk = clk_get(cpu_dev, NULL);

		if (IS_ERR(clk)) {

			pr_warn("Cannot get clock for CPU %d\n", cpu);

		} else {
@@ -165,7 +165,7 @@ static int __init armada_8k_cpufreq_init(void) 
			continue;

		}



		clk = clk_get(cpu_dev, 0);

		clk = clk_get(cpu_dev, NULL);



		if (IS_ERR(clk)) {

			pr_err("Cannot get clock for CPU %d\n", cpu);

drivers/cpufreq/scmi-cpufreq.c

+5 −2
Original line number Diff line number Diff line
@@ -334,8 +334,11 @@ static int scmi_cpufreq_probe(struct scmi_device *sdev) 


#ifdef CONFIG_COMMON_CLK

	/* dummy clock provider as needed by OPP if clocks property is used */

	if (of_property_present(dev->of_node, "#clock-cells"))

		devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, NULL);

	if (of_property_present(dev->of_node, "#clock-cells")) {

		ret = devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, NULL);

		if (ret)

			return dev_err_probe(dev, ret, "%s: registering clock provider failed\n", __func__);

	}

#endif



	ret = cpufreq_register_driver(&scmi_cpufreq_driver);