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

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

Pull cpufreq/arm updates for 6.1-rc1 from Viresh Kumar:

"- Add SM6115 to cpufreq-dt blocklist (Adam Skladowski).
 - Add support for Tegra239 and minor cleanups (Sumit Gupta, ye xingchen,
   and Yang Yingliang).
 - Add freq qos for qcom cpufreq driver and minor cleanups (Xuewen Yan,
   and Viresh Kumar).
 - Minor cleanups around functions called at module_init() (Xiu Jianfeng).
 - Use module_init and add module_exit for bmips driver (Zhang
   Jianhua)."

* tag 'cpufreq-arm-updates-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
  cpufreq: qcom-cpufreq-hw: Add cpufreq qos for LMh
  cpufreq: Add __init annotation to module init funcs
  cpufreq: tegra194: change tegra239_cpufreq_soc to static
  cpufreq: tegra194: Add support for Tegra239
  cpufreq: qcom-cpufreq-hw: Fix uninitialized throttled_freq warning
  cpufreq: tegra194: Remove the unneeded result variable
  cpufreq: bmips-cpufreq: Use module_init and add module_exit
  cpufreq: Add SM6115 to cpufreq-dt-platdev blocklist
parents 71bb5c82 c4c0efb0

drivers/cpufreq/bmips-cpufreq.c

+8 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static struct cpufreq_driver bmips_cpufreq_driver = { 
	.name		= BMIPS_CPUFREQ_PREFIX,

};



static int __init bmips_cpufreq_probe(void)

static int __init bmips_cpufreq_driver_init(void)

{

	struct cpufreq_compat *cc;

	struct device_node *np;
@@ -176,7 +176,13 @@ static int __init bmips_cpufreq_probe(void) 


	return cpufreq_register_driver(&bmips_cpufreq_driver);

}

device_initcall(bmips_cpufreq_probe);

module_init(bmips_cpufreq_driver_init);



static void __exit bmips_cpufreq_driver_exit(void)

{

	cpufreq_unregister_driver(&bmips_cpufreq_driver);

}

module_exit(bmips_cpufreq_driver_exit);



MODULE_AUTHOR("Markus Mayer <mmayer@broadcom.com>");

MODULE_DESCRIPTION("CPUfreq driver for Broadcom BMIPS SoCs");

drivers/cpufreq/cpufreq-dt-platdev.c

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ static const struct of_device_id blocklist[] __initconst = { 
	{ .compatible = "qcom,sc8180x", },

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

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

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

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

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

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

drivers/cpufreq/highbank-cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static struct notifier_block hb_cpufreq_clk_nb = { 
	.notifier_call = hb_cpufreq_clk_notify,

};



static int hb_cpufreq_driver_init(void)

static int __init hb_cpufreq_driver_init(void)

{

	struct platform_device_info devinfo = { .name = "cpufreq-dt", };

	struct device *cpu_dev;

drivers/cpufreq/qcom-cpufreq-hw.c

+19 −5
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/of_address.h>

#include <linux/of_platform.h>

#include <linux/pm_opp.h>

#include <linux/pm_qos.h>

#include <linux/slab.h>

#include <linux/spinlock.h>

#include <linux/units.h>
@@ -56,6 +57,8 @@ struct qcom_cpufreq_data { 
	struct cpufreq_policy *policy;



	bool per_core_dcvs;



	struct freq_qos_request throttle_freq_req;

};



static unsigned long cpu_hw_rate, xo_rate;
@@ -316,14 +319,16 @@ static void qcom_lmh_dcvs_notify(struct qcom_cpufreq_data *data) 
	if (IS_ERR(opp)) {

		dev_warn(dev, "Can't find the OPP for throttling: %pe!\n", opp);

	} else {

		dev_pm_opp_put(opp);

	}



	throttled_freq = freq_hz / HZ_PER_KHZ;



	freq_qos_update_request(&data->throttle_freq_req, throttled_freq);



	/* Update thermal pressure (the boost frequencies are accepted) */

	arch_update_thermal_pressure(policy->related_cpus, throttled_freq);



		dev_pm_opp_put(opp);

	}



	/*

	 * In the unlikely case policy is unregistered do not enable

	 * polling or h/w interrupt
@@ -413,6 +418,14 @@ static int qcom_cpufreq_hw_lmh_init(struct cpufreq_policy *policy, int index) 
	if (data->throttle_irq < 0)

		return data->throttle_irq;



	ret = freq_qos_add_request(&policy->constraints,

				   &data->throttle_freq_req, FREQ_QOS_MAX,

				   FREQ_QOS_MAX_DEFAULT_VALUE);

	if (ret < 0) {

		dev_err(&pdev->dev, "Failed to add freq constraint (%d)\n", ret);

		return ret;

	}



	data->cancel_throttle = false;

	data->policy = policy;
@@ -479,6 +492,7 @@ static void qcom_cpufreq_hw_lmh_exit(struct qcom_cpufreq_data *data) 
	if (data->throttle_irq <= 0)

		return;



	freq_qos_remove_request(&data->throttle_freq_req);

	free_irq(data->throttle_irq, data);

}

drivers/cpufreq/sti-cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ static int sti_cpufreq_fetch_syscon_registers(void) 
	return 0;

}



static int sti_cpufreq_init(void)

static int __init sti_cpufreq_init(void)

{

	int ret;