From patchwork Wed Mar 20 22:36:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 2310121 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 2226140213 for ; Wed, 20 Mar 2013 22:47:06 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UIRjR-00067g-L9; Wed, 20 Mar 2013 22:43:42 +0000 Received: from mail.free-electrons.com ([94.23.35.102]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UIRdT-0002YI-VB for linux-arm-kernel@lists.infradead.org; Wed, 20 Mar 2013 22:37:34 +0000 Received: by mail.free-electrons.com (Postfix, from userid 106) id 3ABC87D4; Wed, 20 Mar 2013 23:37:31 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.3.2 Received: from localhost.localdomain (20.222.3.200.ros.express.com.ar [200.3.222.20]) by mail.free-electrons.com (Postfix) with ESMTPA id DA0387D4; Wed, 20 Mar 2013 23:37:26 +0100 (CET) From: Ezequiel Garcia To: Subject: [PATCH 11/16] thermal: mvebu: Add support for Armada XP thermal sensor Date: Wed, 20 Mar 2013 19:36:32 -0300 Message-Id: <1363818997-23137-12-git-send-email-ezequiel.garcia@free-electrons.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1363818997-23137-1-git-send-email-ezequiel.garcia@free-electrons.com> References: <1363818997-23137-1-git-send-email-ezequiel.garcia@free-electrons.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130320_183732_236226_49C90692 X-CRM114-Status: GOOD ( 17.86 ) X-Spam-Score: -4.4 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -2.5 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Thomas Petazzoni , Andrew Lunn , Jason Cooper , Nobuhiro Iwamatsu , linux-pm@vger.kernel.org, Lior Amsalem , Ezequiel Garcia , Gregory Clement , Zhang Rui , Florian Fainelli , Sebastian Hesselbarth X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org With the infrastructure introduced to support more SoC, we can now easily add another thermal sensor. The Armada XP sensor has no register to check for a valid temperature, and has a special formula to obtain the temperature from the thermal sensor output register. Signed-off-by: Ezequiel Garcia --- .../devicetree/bindings/thermal/mvebu-thermal.txt | 21 ++++++--- drivers/thermal/mvebu_thermal.c | 50 ++++++++++++++++++++ 2 files changed, 64 insertions(+), 7 deletions(-) diff --git a/Documentation/devicetree/bindings/thermal/mvebu-thermal.txt b/Documentation/devicetree/bindings/thermal/mvebu-thermal.txt index 8c0f5eb..7cc3fd4 100644 --- a/Documentation/devicetree/bindings/thermal/mvebu-thermal.txt +++ b/Documentation/devicetree/bindings/thermal/mvebu-thermal.txt @@ -1,13 +1,20 @@ -* Kirkwood Thermal - -This version is for Kirkwood 88F8262 & 88F6283 SoCs. Other kirkwoods -don't contain a thermal sensor. +* Marvell EBU Thermal Required properties: -- compatible : "marvell,kirkwood-thermal" -- reg : Address range of the thermal registers -Example: +- compatible: Should be set to one of the following: + marvell,kirkwood-thermal + marvell,armadaxp-thermal + +- reg: Device's register space. + One or two entries are expected, see the examples below. + The first one is required for the sensor register; + the second one is optional and is used as the control + register for sensor calibration. + Currently the only SoC variant having one register range + is Kirkwood. + +Kirkwood example: thermal@10078 { compatible = "marvell,kirkwood-thermal"; diff --git a/drivers/thermal/mvebu_thermal.c b/drivers/thermal/mvebu_thermal.c index bfe4817..50f13e7 100644 --- a/drivers/thermal/mvebu_thermal.c +++ b/drivers/thermal/mvebu_thermal.c @@ -1,6 +1,7 @@ /* * Marvell EBU thermal sensor driver * + * Copyright (C) 2013 Marvell * Copyright (C) 2012 Nobuhiro Iwamatsu * * This software is licensed under the terms of the GNU General Public @@ -24,12 +25,21 @@ #include #define MVEBU_THERMAL_SOC_VARIANT_KIRKWOOD 0x1 +#define MVEBU_THERMAL_SOC_VARIANT_ARMADA_XP 0x2 #define MVEBU_THERMAL_VALID_OFFSET 9 #define MVEBU_THERMAL_VALID_MASK 0x1 #define MVEBU_THERMAL_TEMP_OFFSET 10 #define MVEBU_THERMAL_TEMP_MASK 0x1FF +/* Thermal Manager Control and Status Register */ +#define PMU_TDC0_SW_RST_MASK (0x1 << 1) +#define PMU_TM_DISABLE_OFFS 0 +#define PMU_TM_DISABLE_MASK (0x1 << PMU_TM_DISABLE_OFFS) +#define PMU_TDC0_REF_CAL_CNT_OFFS 11 +#define PMU_TDC0_REF_CAL_CNT_MASK (0x1ff << PMU_TDC0_REF_CAL_CNT_OFFS) +#define PMU_TDC0_OTF_CAL_MASK (0x1 << 30) + /* Marvell EBU Thermal Sensor Dev Structure */ struct mvebu_thermal_priv { void __iomem *sensor; @@ -43,6 +53,35 @@ struct mvebu_thermal_priv { bool (*is_valid)(struct mvebu_thermal_priv *); }; +static void armadaxp_init_sensor(struct mvebu_thermal_priv *priv) +{ + unsigned long reg; + + if (!priv->control) + return; + + /* ??? */ + reg = readl_relaxed(priv->control); + reg |= PMU_TDC0_OTF_CAL_MASK; + writel(reg, priv->control); + + /* Reference calibration value */ + reg &= ~PMU_TDC0_REF_CAL_CNT_MASK; + reg |= (0xf1 << PMU_TDC0_REF_CAL_CNT_OFFS); + writel(reg, priv->control); + + /* Reset the sensor */ + reg = readl_relaxed(priv->control); + writel((reg | PMU_TDC0_SW_RST_MASK), priv->control); + + writel(reg, priv->control); + + /* Enable the sensor */ + reg = readl_relaxed(priv->sensor); + reg &= ~PMU_TM_DISABLE_MASK; + writel(reg, priv->sensor); +} + static bool mvebu_is_valid(struct mvebu_thermal_priv *priv) { unsigned long reg = readl_relaxed(priv->sensor); @@ -71,6 +110,9 @@ static int mvebu_get_temp(struct thermal_zone_device *thermal, case MVEBU_THERMAL_SOC_VARIANT_KIRKWOOD: *temp = ((2363302UL - (7339*reg)) / 10); break; + case MVEBU_THERMAL_SOC_VARIANT_ARMADA_XP: + *temp = (3153000000UL - (10000000UL*reg)) / 13825; + break; default: *temp = 0; break; @@ -88,6 +130,10 @@ static const struct of_device_id mvebu_thermal_id_table[] = { .data = (void *) MVEBU_THERMAL_SOC_VARIANT_KIRKWOOD, }, { + .compatible = "marvell,armadaxp-thermal", + .data = (void *) MVEBU_THERMAL_SOC_VARIANT_ARMADA_XP, + }, + { /* sentinel */ }, }; @@ -130,6 +176,9 @@ static int mvebu_thermal_probe(struct platform_device *pdev) case MVEBU_THERMAL_SOC_VARIANT_KIRKWOOD: priv->is_valid = mvebu_is_valid; break; + case MVEBU_THERMAL_SOC_VARIANT_ARMADA_XP: + priv->init_sensor = armadaxp_init_sensor; + break; default: break; } @@ -174,5 +223,6 @@ static struct platform_driver mvebu_thermal_driver = { module_platform_driver(mvebu_thermal_driver); MODULE_AUTHOR("Nobuhiro Iwamatsu "); +MODULE_AUTHOR("Ezequiel Garcia "); MODULE_DESCRIPTION("mvebu thermal driver"); MODULE_LICENSE("GPL v2");