From patchwork Fri Mar 22 22:25:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 2323251 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 AD1F3DFE82 for ; Fri, 22 Mar 2013 22:35:01 +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 1UJAVH-00076p-Pa; Fri, 22 Mar 2013 22:32:04 +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 1UJAPS-0004BG-4B for linux-arm-kernel@lists.infradead.org; Fri, 22 Mar 2013 22:26:03 +0000 Received: by mail.free-electrons.com (Postfix, from userid 106) id 12732FF0; Fri, 22 Mar 2013 23:26:01 +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 3CDA67DE; Fri, 22 Mar 2013 23:25:58 +0100 (CET) From: Ezequiel Garcia To: , Subject: [PATCH v2 10/14] thermal: mvebu: Add support for Armada 370 thermal sensor Date: Fri, 22 Mar 2013 19:25:10 -0300 Message-Id: <1363991114-4225-11-git-send-email-ezequiel.garcia@free-electrons.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1363991114-4225-1-git-send-email-ezequiel.garcia@free-electrons.com> References: <1363991114-4225-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-20130322_182602_578614_9018F9BA X-CRM114-Status: GOOD ( 14.45 ) 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: Lior Amsalem , Thomas Petazzoni , Jason Cooper , Nobuhiro Iwamatsu , Andrew Lunn , Ezequiel Garcia , Gregory Clement , Zhang Rui , 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, its own function to initialize (i.e. calibrate) the thermal sensor. The temperature formula is the same as the one for Armada XP. Signed-off-by: Ezequiel Garcia --- .../devicetree/bindings/thermal/mvebu-thermal.txt | 1 + drivers/thermal/mvebu_thermal.c | 37 ++++++++++++++++++++ 2 files changed, 38 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 fc4d9f4..56c58b1 100644 --- a/drivers/thermal/mvebu_thermal.c +++ b/drivers/thermal/mvebu_thermal.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -36,6 +37,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) struct mvebu_thermal_ops; @@ -86,6 +88,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); @@ -142,6 +169,12 @@ static const struct mvebu_thermal_ops armadaxp_ops = { .init_sensor = armadaxp_init_sensor, }; +static const struct mvebu_thermal_ops armada370_ops = { + .sensor_temp = armada_sensor_temp, + .is_valid = mvebu_is_valid, + .init_sensor = armada370_init_sensor, +}; + static const struct of_device_id mvebu_thermal_id_table[] = { { .compatible = "marvell,kirkwood-thermal", @@ -152,6 +185,10 @@ static const struct of_device_id mvebu_thermal_id_table[] = { .data = &armadaxp_ops, }, { + .compatible = "marvell,armada370-thermal", + .data = &armada370_ops, + }, + { /* sentinel */ }, };