linux-pm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Zhang Rui <rui.zhang@intel.com>
To: linux-pm@vger.kernel.org
Cc: "hongbo.zhang" <hongbo.zhang@linaro.com>,
	Zhang Rui <rui.zhang@intel.com>
Subject: [PATCH 30/34] Thermal: Add ST-Ericsson DB8500 thermal properties and platform data.
Date: Sun,  2 Dec 2012 22:45:04 +0800	[thread overview]
Message-ID: <1354459508-3707-30-git-send-email-rui.zhang@intel.com> (raw)
In-Reply-To: <1354459508-3707-1-git-send-email-rui.zhang@intel.com>

From: "hongbo.zhang" <hongbo.zhang@linaro.com>

This patch adds device tree properties for ST-Ericsson DB8500 thermal driver,
also adds the platform data to support the old fashion.

Signed-off-by: hongbo.zhang <hongbo.zhang@linaro.com>
Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---
 arch/arm/boot/dts/dbx5x0.dtsi      |   14 ++++++++
 arch/arm/boot/dts/snowball.dts     |   31 +++++++++++++++++
 arch/arm/configs/u8500_defconfig   |    2 +
 arch/arm/mach-ux500/board-mop500.c |   64 ++++++++++++++++++++++++++++++++++++
 4 files changed, 111 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi
index 4b0e0ca..731086b 100644
--- a/arch/arm/boot/dts/dbx5x0.dtsi
+++ b/arch/arm/boot/dts/dbx5x0.dtsi
@@ -203,6 +203,14 @@
 				reg = <0x80157450 0xC>;
 			};
 
+			thermal@801573c0 {
+				compatible = "stericsson,db8500-thermal";
+				reg = <0x801573c0 0x40>;
+				interrupts = <21 0x4>, <22 0x4>;
+				interrupt-names = "IRQ_HOTMON_LOW", "IRQ_HOTMON_HIGH";
+				status = "disabled";
+			 };
+
 			db8500-prcmu-regulators {
 				compatible = "stericsson,db8500-prcmu-regulator";
 
@@ -660,5 +668,11 @@
 			ranges = <0 0x50000000 0x4000000>;
 			status = "disabled";
 		};
+
+		cpufreq-cooling {
+			compatible = "stericsson,db8500-cpufreq-cooling";
+			status = "disabled";
+		 };
+
 	};
 };
diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts
index 702c0ba..c6f85f0 100644
--- a/arch/arm/boot/dts/snowball.dts
+++ b/arch/arm/boot/dts/snowball.dts
@@ -99,6 +99,33 @@
 			status = "okay";
 		};
 
+		prcmu@80157000 {
+			thermal@801573c0 {
+				num-trips = <4>;
+
+				trip0-temp = <70000>;
+				trip0-type = "active";
+				trip0-cdev-num = <1>;
+				trip0-cdev-name0 = "thermal-cpufreq-0";
+
+				trip1-temp = <75000>;
+				trip1-type = "active";
+				trip1-cdev-num = <1>;
+				trip1-cdev-name0 = "thermal-cpufreq-0";
+
+				trip2-temp = <80000>;
+				trip2-type = "active";
+				trip2-cdev-num = <1>;
+				trip2-cdev-name0 = "thermal-cpufreq-0";
+
+				trip3-temp = <85000>;
+				trip3-type = "critical";
+				trip3-cdev-num = <0>;
+
+				status = "okay";
+			 };
+		};
+
 		external-bus@50000000 {
 			status = "okay";
 
@@ -183,5 +210,9 @@
 				reg = <0x33>;
 			};
 		};
+
+		cpufreq-cooling {
+			status = "okay";
+		};
 	};
 };
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index da68454..250625d 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -69,6 +69,8 @@ CONFIG_GPIO_TC3589X=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_AB8500_BM=y
 CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL=y
+CONFIG_THERMAL=y
+CONFIG_CPU_THERMAL=y
 CONFIG_MFD_STMPE=y
 CONFIG_MFD_TC3589X=y
 CONFIG_AB5500_CORE=y
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 416d436..b03216b 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -16,6 +16,7 @@
 #include <linux/io.h>
 #include <linux/i2c.h>
 #include <linux/platform_data/i2c-nomadik.h>
+#include <linux/platform_data/db8500_thermal.h>
 #include <linux/gpio.h>
 #include <linux/amba/bus.h>
 #include <linux/amba/pl022.h>
@@ -229,6 +230,67 @@ static struct ab8500_platform_data ab8500_platdata = {
 };
 
 /*
+ * Thermal Sensor
+ */
+
+static struct resource db8500_thsens_resources[] = {
+	{
+		.name = "IRQ_HOTMON_LOW",
+		.start  = IRQ_PRCMU_HOTMON_LOW,
+		.end    = IRQ_PRCMU_HOTMON_LOW,
+		.flags  = IORESOURCE_IRQ,
+	},
+	{
+		.name = "IRQ_HOTMON_HIGH",
+		.start  = IRQ_PRCMU_HOTMON_HIGH,
+		.end    = IRQ_PRCMU_HOTMON_HIGH,
+		.flags  = IORESOURCE_IRQ,
+	},
+};
+
+static struct db8500_thsens_platform_data db8500_thsens_data = {
+	.trip_points[0] = {
+		.temp = 70000,
+		.type = THERMAL_TRIP_ACTIVE,
+		.cdev_name = {
+			[0] = "thermal-cpufreq-0",
+		},
+	},
+	.trip_points[1] = {
+		.temp = 75000,
+		.type = THERMAL_TRIP_ACTIVE,
+		.cdev_name = {
+			[0] = "thermal-cpufreq-0",
+		},
+	},
+	.trip_points[2] = {
+		.temp = 80000,
+		.type = THERMAL_TRIP_ACTIVE,
+		.cdev_name = {
+			[0] = "thermal-cpufreq-0",
+		},
+	},
+	.trip_points[3] = {
+		.temp = 85000,
+		.type = THERMAL_TRIP_CRITICAL,
+	},
+	.num_trips = 4,
+};
+
+static struct platform_device u8500_thsens_device = {
+	.name           = "db8500-thermal",
+	.resource       = db8500_thsens_resources,
+	.num_resources  = ARRAY_SIZE(db8500_thsens_resources),
+	.dev	= {
+		.platform_data	= &db8500_thsens_data,
+	},
+};
+
+static struct platform_device u8500_cpufreq_cooling_device = {
+	.name           = "db8500-cpufreq-cooling",
+};
+
+/*
  * TPS61052
  */
 
@@ -583,6 +645,8 @@ static struct platform_device *snowball_platform_devs[] __initdata = {
 	&snowball_key_dev,
 	&snowball_sbnet_dev,
 	&snowball_gpio_en_3v3_regulator_dev,
+	&u8500_thsens_device,
+	&u8500_cpufreq_cooling_device,
 };
 
 static void __init mop500_init_machine(void)
-- 
1.7.7.6


  parent reply	other threads:[~2012-12-02 14:45 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-02 14:44 [PATCH 01/34] Thermal: Refactor thermal.h file Zhang Rui
2012-12-02 14:44 ` [PATCH 02/34] Thermal: Move thermal_instance to thermal_core.h Zhang Rui
2012-12-02 14:44 ` [PATCH 03/34] Thermal: Add get trend, get instance API's to thermal_sys Zhang Rui
2012-12-02 14:44 ` [PATCH 04/34] Thermal: Add platform level information to thermal.h Zhang Rui
2012-12-02 14:44 ` [PATCH 05/34] Thermal: Pass zone parameters as argument to tzd_register Zhang Rui
2012-12-02 14:44 ` [PATCH 06/34] Thermal: Add thermal governor registration APIs Zhang Rui
2012-12-02 14:44 ` [PATCH 07/34] Thermal: Add a policy sysfs attribute Zhang Rui
2012-12-02 14:44 ` [PATCH 08/34] Thermal: Update binding logic based on platform data Zhang Rui
2012-12-02 14:44 ` [PATCH 09/34] Thermal: Make thermal_cdev_update as a global function Zhang Rui
2012-12-02 14:44 ` [PATCH 10/34] Thermal: Introduce fair_share thermal governor Zhang Rui
2012-12-02 14:44 ` [PATCH 11/34] Thermal: Introduce a step_wise " Zhang Rui
2012-12-02 14:44 ` [PATCH 12/34] Thermal: Add a thermal notifier for user space Zhang Rui
2012-12-02 14:44 ` [PATCH 13/34] Thermal: Remove throttling logic out of thermal_sys.c Zhang Rui
2012-12-02 14:44 ` [PATCH 14/34] Thermal: Add a notification API Zhang Rui
2012-12-02 14:44 ` [PATCH 15/34] Thermal: Add documentation for platform layer data Zhang Rui
2012-12-02 14:44 ` [PATCH 16/34] Thermal: Provide option to choose default thermal governor Zhang Rui
2012-12-02 14:44 ` [PATCH 17/34] Thermal: Fix oops and unlocking in thermal_sys.c Zhang Rui
2012-12-02 14:44 ` [PATCH 18/34] thermal: step_wise: Add missing static storage class specifiers Zhang Rui
2012-12-02 14:44 ` [PATCH 19/34] thermal: fair_share: " Zhang Rui
2012-12-02 14:44 ` [PATCH 20/34] thermal: user_space: " Zhang Rui
2012-12-02 14:44 ` [PATCH 21/34] thermal: rcar_thermal: remove explicitly used devm_kfree/iounap() Zhang Rui
2012-12-02 14:44 ` [PATCH 22/34] Thermal: add indent for code alignment Zhang Rui
2012-12-02 14:44 ` [PATCH 23/34] Thermal: fix bug of counting cpu frequencies Zhang Rui
2012-12-02 14:44 ` [PATCH 24/34] Thermal: Remove the cooling_cpufreq_list Zhang Rui
2012-12-02 14:44 ` [PATCH 25/34] thermal: cpu_cooling: Make 'notify_device' static Zhang Rui
2012-12-02 14:45 ` [PATCH 26/34] Refactor drivers/thermal/Kconfig Zhang Rui
2012-12-02 14:45 ` [PATCH 27/34] Exynos: Add missing dependency Zhang Rui
2012-12-02 14:45 ` [PATCH 28/34] drivers/thermal/Makefile refactor Zhang Rui
2012-12-02 14:45 ` [PATCH 29/34] Thermal: Add ST-Ericsson DB8500 thermal driver Zhang Rui
2012-12-02 14:45 ` Zhang Rui [this message]
2012-12-02 14:45 ` [PATCH 31/34] thermal: cpu cooling: use const parameter while registering Zhang Rui
2012-12-02 14:45 ` [PATCH 32/34] thermal: cpu cooling: allow module builds Zhang Rui
2012-12-02 14:45 ` [PATCH 33/34] thermal: rcar: fixup the unit of temperature Zhang Rui
2012-12-02 14:45 ` [PATCH 34/34] thermal: rcar: add rcar_zone_to_priv() macro Zhang Rui

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=1354459508-3707-30-git-send-email-rui.zhang@intel.com \
    --to=rui.zhang@intel.com \
    --cc=hongbo.zhang@linaro.com \
    --cc=linux-pm@vger.kernel.org \
    /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).