From: Eduardo Valentin <eduardo.valentin@ti.com>
To: swarren@wwwdotorg.org, pawel.moll@arm.com, mark.rutland@arm.com,
ian.campbell@citrix.com, rob.herring@calxeda.com,
linux@roeck-us.net, rui.zhang@intel.com, wni@nvidia.com
Cc: grant.likely@linaro.org, durgadoss.r@intel.com,
linux-pm@vger.kernel.org, devicetree@vger.kernel.org,
lm-sensors@lm-sensors.org, linux-kernel@vger.kernel.org,
Eduardo Valentin <eduardo.valentin@ti.com>,
"Rafael J. Wysocki" <rjw@sisk.pl>,
Viresh Kumar <viresh.kumar@linaro.org>,
cpufreq@vger.kernel.org, devicetree-discuss@lists.ozlabs.org
Subject: [PATCHv4 06/18] cpufreq: cpufreq-cpu0: add dt node parsing for cooling device properties
Date: Thu, 26 Sep 2013 23:13:13 -0400 [thread overview]
Message-ID: <1380251605-3804-7-git-send-email-eduardo.valentin@ti.com> (raw)
In-Reply-To: <1380251605-3804-1-git-send-email-eduardo.valentin@ti.com>
This patch changes the cpufreq-cpu0 driver to consider if
a cpu needs cooling (with cpufreq). In case the cooling is needed,
the cpu0 device tree node needs to be properly configured
with cooling device properties.
In case these properties are present,, the driver will
load a cpufreq cooling device in the system. The cpufreq-cpu0
driver is not interested in determining how the system should
be using the cooling device. The driver is responsible
only of loading the cooling device.
Describing how the cooling device will be used can be
accomplished by setting up a thermal zone that references
and is composed by the cpufreq cooling device.
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: cpufreq@vger.kernel.org
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: devicetree-discuss@lists.ozlabs.org
Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
---
.../devicetree/bindings/cpufreq/cpufreq-cpu0.txt | 7 +++++++
drivers/cpufreq/Kconfig | 2 +-
drivers/cpufreq/cpufreq-cpu0.c | 16 ++++++++++++++++
3 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt b/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt
index 051f764..f055515 100644
--- a/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt
+++ b/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt
@@ -15,6 +15,10 @@ Optional properties:
- clock-latency: Specify the possible maximum transition latency for clock,
in unit of nanoseconds.
- voltage-tolerance: Specify the CPU voltage tolerance in percentage.
+- #cooling-cells:
+- cooling-min-level:
+- cooling-max-level:
+ Please refer to Documentation/devicetree/bindings/thermal/thermal.txt.
Examples:
@@ -33,6 +37,9 @@ cpus {
198000 850000
>;
clock-latency = <61036>; /* two CLK32 periods */
+ #cooling-cells = <2>;
+ cooling-min-level = <0>;
+ cooling-max-level = <2>;
};
cpu@1 {
diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig
index 534fcb8..fc1e9a5 100644
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@ -186,7 +186,7 @@ config CPU_FREQ_GOV_CONSERVATIVE
config GENERIC_CPUFREQ_CPU0
tristate "Generic CPU0 cpufreq driver"
- depends on HAVE_CLK && REGULATOR && PM_OPP && OF
+ depends on HAVE_CLK && REGULATOR && PM_OPP && OF && THERMAL && CPU_THERMAL
select CPU_FREQ_TABLE
help
This adds a generic cpufreq driver for CPU0 frequency management.
diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-cpu0.c
index 78c49d8..fd707b8 100644
--- a/drivers/cpufreq/cpufreq-cpu0.c
+++ b/drivers/cpufreq/cpufreq-cpu0.c
@@ -13,7 +13,9 @@
#include <linux/clk.h>
#include <linux/cpu.h>
+#include <linux/cpu_cooling.h>
#include <linux/cpufreq.h>
+#include <linux/cpumask.h>
#include <linux/err.h>
#include <linux/module.h>
#include <linux/of.h>
@@ -21,6 +23,7 @@
#include <linux/platform_device.h>
#include <linux/regulator/consumer.h>
#include <linux/slab.h>
+#include <linux/thermal.h>
static unsigned int transition_latency;
static unsigned int voltage_tolerance; /* in percentage */
@@ -29,6 +32,7 @@ static struct device *cpu_dev;
static struct clk *cpu_clk;
static struct regulator *cpu_reg;
static struct cpufreq_frequency_table *freq_table;
+static struct thermal_cooling_device *cdev;
static int cpu0_verify_speed(struct cpufreq_policy *policy)
{
@@ -260,6 +264,17 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev)
goto out_free_table;
}
+ /*
+ * For now, just loading the cooling device;
+ * thermal DT code takes care of matching them.
+ */
+ if (of_find_property(np, "#cooling-cells", NULL)) {
+ cdev = of_cpufreq_cooling_register(np, cpu_present_mask);
+ if (IS_ERR(cdev))
+ pr_err("running cpufreq without cooling device: %ld\n",
+ PTR_ERR(cdev));
+ }
+
of_node_put(np);
return 0;
@@ -272,6 +287,7 @@ out_put_node:
static int cpu0_cpufreq_remove(struct platform_device *pdev)
{
+ cpufreq_cooling_unregister(cdev);
cpufreq_unregister_driver(&cpu0_cpufreq_driver);
opp_free_cpufreq_table(cpu_dev, &freq_table);
--
1.8.2.1.342.gfa7285d
next prev parent reply other threads:[~2013-09-27 3:13 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-27 3:13 [PATCHv4 00/18] device thermal limits represented in device tree nodes (v4) Eduardo Valentin
2013-09-27 3:13 ` [PATCHv4 01/18] thermal: allow registering without .get_temp Eduardo Valentin
2013-09-27 3:13 ` [PATCHv4 02/18] thermal: core: allow binding via .bind when tzp is present Eduardo Valentin
2013-11-06 2:56 ` Wei Ni
2013-09-27 3:13 ` [PATCHv7 03/18] thermal: introduce device tree parser Eduardo Valentin
2013-09-30 15:36 ` Mark Rutland
[not found] ` <20130930153614.GA22259-NuALmloUBlrZROr8t4l/smS4ubULX0JqMm0uRHvK7Nw@public.gmane.org>
2013-09-30 20:47 ` Eduardo Valentin
[not found] ` <1380251605-3804-4-git-send-email-eduardo.valentin-l0cyMroinI0@public.gmane.org>
2013-10-01 2:39 ` [PATCHv8 " Eduardo Valentin
2013-10-07 20:51 ` Mark Rutland
2013-10-08 14:59 ` Eduardo Valentin
2013-11-05 18:08 ` Eduardo Valentin
2013-09-27 3:13 ` [PATCHv4 05/18] thermal: cpu_cooling: introduce of_cpufreq_cooling_register Eduardo Valentin
2013-09-27 3:13 ` Eduardo Valentin [this message]
2013-09-27 3:13 ` [PATCHv4 07/18] hwmon: lm75: expose to thermal fw via DT nodes Eduardo Valentin
2013-09-27 3:13 ` [PATCHv4 09/18] thermal: ti-soc-thermal: use thermal DT infrastructure Eduardo Valentin
2013-09-27 3:13 ` [PATCHv4 10/18] arm: dts: add omap4 CPU thermal data Eduardo Valentin
2013-09-27 3:13 ` [PATCHv4 11/18] arm: dts: add omap4430 " Eduardo Valentin
2013-09-27 12:24 ` Nishanth Menon
2013-09-27 13:20 ` Eduardo Valentin
2013-09-27 13:26 ` Nishanth Menon
2013-09-27 13:42 ` Eduardo Valentin
2013-09-27 3:13 ` [PATCHv4 12/18] arm: dts: add omap4460 " Eduardo Valentin
2013-09-27 3:13 ` [PATCHv4 14/18] arm: dts: add cooling properties on omap4460 cpu node Eduardo Valentin
2013-09-27 3:13 ` [PATCHv4 15/18] arm: dts: add omap5 GPU thermal data Eduardo Valentin
2013-09-27 3:13 ` [PATCHv4 16/18] arm: dts: add omap5 CORE " Eduardo Valentin
[not found] ` <1380251605-3804-1-git-send-email-eduardo.valentin-l0cyMroinI0@public.gmane.org>
2013-09-27 3:13 ` [PATCHv4 04/18] thermal: core: introduce thermal_of_cooling_device_register Eduardo Valentin
2013-09-27 3:13 ` [PATCHv4 08/18] hwmon: tmp102: expose to thermal fw via DT nodes Eduardo Valentin
2013-09-27 3:13 ` [PATCHv4 13/18] arm: dts: add cooling properties on omap4430 cpu node Eduardo Valentin
2013-09-27 3:13 ` [PATCHv4 17/18] arm: dts: add omap5 thermal data Eduardo Valentin
2013-09-27 3:13 ` [PATCHv4 18/18] arm: dts: add cooling properties on omap5 cpu node Eduardo Valentin
2013-09-27 3:15 ` [PATCHv4 00/18] device thermal limits represented in device tree nodes (v4) Eduardo Valentin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1380251605-3804-7-git-send-email-eduardo.valentin@ti.com \
--to=eduardo.valentin@ti.com \
--cc=cpufreq@vger.kernel.org \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=devicetree@vger.kernel.org \
--cc=durgadoss.r@intel.com \
--cc=grant.likely@linaro.org \
--cc=ian.campbell@citrix.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=lm-sensors@lm-sensors.org \
--cc=mark.rutland@arm.com \
--cc=pawel.moll@arm.com \
--cc=rjw@sisk.pl \
--cc=rob.herring@calxeda.com \
--cc=rui.zhang@intel.com \
--cc=swarren@wwwdotorg.org \
--cc=viresh.kumar@linaro.org \
--cc=wni@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).