From patchwork Wed Mar 20 22:36:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 2310141 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 54807DF24C for ; Wed, 20 Mar 2013 22:47:30 +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 1UIRk7-0006Zt-KG; Wed, 20 Mar 2013 22:44:23 +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 1UIRdZ-0002aE-Ht for linux-arm-kernel@lists.infradead.org; Wed, 20 Mar 2013 22:37:38 +0000 Received: by mail.free-electrons.com (Postfix, from userid 106) id E7C31143B; Wed, 20 Mar 2013 23:37:36 +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 85CB37D6; Wed, 20 Mar 2013 23:37:31 +0100 (CET) From: Ezequiel Garcia To: Subject: [PATCH 12/16] thermal: mvebu: Add support for Armada 370 thermal sensor Date: Wed, 20 Mar 2013 19:36:33 -0300 Message-Id: <1363818997-23137-13-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_183738_057797_FA6C5B0D X-CRM114-Status: GOOD ( 14.59 ) 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 The Armada 370 has a register to check a valid temperature, and its own formula to obtain the temperature from the thermal sensor output register. Signed-off-by: Ezequiel Garcia --- .../devicetree/bindings/thermal/mvebu-thermal.txt | 1 + drivers/thermal/mvebu_thermal.c | 39 ++++++++++++++++++++ 2 files changed, 40 insertions(+), 0 deletions(-) diff --git a/Documentation/devicetree/bindings/thermal/mvebu-thermal.txt b/Documentation/devicetree/bindings/thermal/mvebu-thermal.txt index 7cc3fd4..49d55a9 100644 --- a/Documentation/devicetree/bindings/thermal/mvebu-thermal.txt +++ b/Documentation/devicetree/bindings/thermal/mvebu-thermal.txt @@ -5,6 +5,7 @@ Required properties: - compatible: Should be set to one of the following: marvell,kirkwood-thermal marvell,armadaxp-thermal + marvell,armada370-thermal - reg: Device's register space. One or two entries are expected, see the examples below. diff --git a/drivers/thermal/mvebu_thermal.c b/drivers/thermal/mvebu_thermal.c index 50f13e7..0b1e7a8 100644 --- a/drivers/thermal/mvebu_thermal.c +++ b/drivers/thermal/mvebu_thermal.c @@ -20,12 +20,14 @@ #include #include #include +#include #include #include #include #define MVEBU_THERMAL_SOC_VARIANT_KIRKWOOD 0x1 #define MVEBU_THERMAL_SOC_VARIANT_ARMADA_XP 0x2 +#define MVEBU_THERMAL_SOC_VARIANT_ARMADA_370 0x3 #define MVEBU_THERMAL_VALID_OFFSET 9 #define MVEBU_THERMAL_VALID_MASK 0x1 @@ -39,6 +41,7 @@ #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) +#define PMU_TDC0_START_CAL_MASK (0x1 << 25) /* Marvell EBU Thermal Sensor Dev Structure */ struct mvebu_thermal_priv { @@ -82,6 +85,31 @@ static void armadaxp_init_sensor(struct mvebu_thermal_priv *priv) writel(reg, priv->sensor); } +static void armada370_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); + + /* ??? */ + reg &= ~PMU_TDC0_START_CAL_MASK; + writel(reg, priv->control); + + /* FIXME: Why do we need this delay? */ + mdelay(10); +} + static bool mvebu_is_valid(struct mvebu_thermal_priv *priv) { unsigned long reg = readl_relaxed(priv->sensor); @@ -113,6 +141,9 @@ static int mvebu_get_temp(struct thermal_zone_device *thermal, case MVEBU_THERMAL_SOC_VARIANT_ARMADA_XP: *temp = (3153000000UL - (10000000UL*reg)) / 13825; break; + case MVEBU_THERMAL_SOC_VARIANT_ARMADA_370: + *temp = (228000UL - 723*reg); + break; default: *temp = 0; break; @@ -134,6 +165,10 @@ static const struct of_device_id mvebu_thermal_id_table[] = { .data = (void *) MVEBU_THERMAL_SOC_VARIANT_ARMADA_XP, }, { + .compatible = "marvell,armada370-thermal", + .data = (void *) MVEBU_THERMAL_SOC_VARIANT_ARMADA_370, + }, + { /* sentinel */ }, }; @@ -179,6 +214,10 @@ static int mvebu_thermal_probe(struct platform_device *pdev) case MVEBU_THERMAL_SOC_VARIANT_ARMADA_XP: priv->init_sensor = armadaxp_init_sensor; break; + case MVEBU_THERMAL_SOC_VARIANT_ARMADA_370: + priv->is_valid = mvebu_is_valid; + priv->init_sensor = armada370_init_sensor; + break; default: break; }