From patchwork Sun Dec 3 11:11:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 10089217 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BE5986035E for ; Sun, 3 Dec 2017 11:20:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A560B28C84 for ; Sun, 3 Dec 2017 11:20:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 970D128E79; Sun, 3 Dec 2017 11:20:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1D97228C84 for ; Sun, 3 Dec 2017 11:20:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=EvbJUq6Pnm7ph1neiobwDCebeQ2g3OotEpmChNmvAPs=; b=ji66Ls9n5CEAvm5p7+h9NBd3MA cuB5FSZOXUKG/MaPF8VSwOGi3VWArflc8lF/cUNi7EgKqKH3FDP/TieRZUnccDuoo+16My1L0AQDI 9ZI/B0LMQ02Hc0oUjNJBG7N/2eWSEo6mQBYMbVRRfI/XEyHS9vizO3ReyZcQTGgI8OyJeBi8wTmiV 0sE3JjS+Zw5nJDqL+fJIekMfIm/wkOMl/1WK8ADypRsfY8L3uiFpi9UJr8Fev4iilX1hwcT0Ln3TN /aU/thCPI+ySw63xiNaeBIjX1Hm2lBKfdu5jqQOvHnjMOf8kn8JT6J81wauaJdopmINFthzzPkDSe djCKdKmw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eLSJf-0008Ix-G6; Sun, 03 Dec 2017 11:20:11 +0000 Received: from guitar.tcltek.co.il ([192.115.133.116] helo=mx.tkos.co.il) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eLSIl-0006j0-0g for linux-arm-kernel@lists.infradead.org; Sun, 03 Dec 2017 11:19:17 +0000 Received: from sapphire.lan (unknown [10.0.4.3]) by mx.tkos.co.il (Postfix) with ESMTPA id 98E9044093E; Sun, 3 Dec 2017 13:18:50 +0200 (IST) From: Baruch Siach To: Zhang Rui , Eduardo Valentin Subject: [PATCH v2 2/4] thermal: armada: add support for AP806 Date: Sun, 3 Dec 2017 13:11:22 +0200 Message-Id: <0aa7ef4c48974f5973ff637ab37aee620d35b8fe.1512299484.git.baruch@tkos.co.il> X-Mailer: git-send-email 2.15.0 In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171203_031915_567887_952DFB74 X-CRM114-Status: GOOD ( 13.23 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Baruch Siach , Jason Cooper , Andrew Lunn , linux-pm@vger.kernel.org, Russell King , Miquel Raynal , Gregory Clement , linux-arm-kernel@lists.infradead.org, Sebastian Hesselbarth MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The AP806 component is integrated in the Armada 8k and 7k lines of processors. The thermal sensor sample field on the status register is a signed value. Extend armada_get_temp() to handle signed values. Signed-off-by: Baruch Siach --- v2: Use msleep instead of mdelay (RMK). Fix temperature calculation formula according to recent documentation and vendor code. Update the commit log. --- drivers/thermal/armada_thermal.c | 44 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c index 706d74798cbe..0eb82097571f 100644 --- a/drivers/thermal/armada_thermal.c +++ b/drivers/thermal/armada_thermal.c @@ -41,6 +41,10 @@ #define A375_HW_RESETn BIT(8) #define A380_HW_RESET BIT(8) +#define AP806_START BIT(0) +#define AP806_RESET BIT(1) +#define AP806_ENABLE BIT(2) + struct armada_thermal_data; /* Marvell EBU Thermal Sensor Dev Structure */ @@ -63,6 +67,7 @@ struct armada_thermal_data { unsigned long coef_m; unsigned long coef_div; bool inverted; + bool signed_sample; /* Register shift and mask to access the sensor temperature */ unsigned int temp_shift; @@ -147,6 +152,18 @@ static void armada380_init_sensor(struct platform_device *pdev, } } +static void armada_ap806_init_sensor(struct platform_device *pdev, + struct armada_thermal_priv *priv) +{ + u32 reg = readl_relaxed(priv->control); + + reg &= ~AP806_RESET; + reg |= AP806_START; + reg |= AP806_ENABLE; + writel(reg, priv->control); + msleep(10); +} + static bool armada_is_valid(struct armada_thermal_priv *priv) { unsigned long reg = readl_relaxed(priv->sensor); @@ -160,6 +177,7 @@ static int armada_get_temp(struct thermal_zone_device *thermal, struct armada_thermal_priv *priv = thermal->devdata; unsigned long reg; unsigned long m, b, div; + int sample; /* Valid check */ if (priv->data->is_valid && !priv->data->is_valid(priv)) { @@ -170,6 +188,11 @@ static int armada_get_temp(struct thermal_zone_device *thermal, reg = readl_relaxed(priv->sensor); reg = (reg >> priv->data->temp_shift) & priv->data->temp_mask; + if (priv->data->signed_sample) + /* The most significant bit is the sign bit */ + sample = sign_extend32(reg, fls(priv->data->temp_mask) - 1); + else + sample = reg; /* Get formula coeficients */ b = priv->data->coef_b; @@ -177,9 +200,9 @@ static int armada_get_temp(struct thermal_zone_device *thermal, div = priv->data->coef_div; if (priv->data->inverted) - *temp = ((m * reg) - b) / div; + *temp = ((m * sample) - b) / div; else - *temp = (b - (m * reg)) / div; + *temp = (b - (m * sample)) / div; return 0; } @@ -230,6 +253,19 @@ static const struct armada_thermal_data armada380_data = { .inverted = true, }; +static const struct armada_thermal_data armada_ap806_data = { + .is_valid = armada_is_valid, + .init_sensor = armada_ap806_init_sensor, + .is_valid_shift = 16, + .temp_shift = 0, + .temp_mask = 0x3ff, + .coef_b = -150000, + .coef_m = 423UL, + .coef_div = 1, + .inverted = true, + .signed_sample = true, +}; + static const struct of_device_id armada_thermal_id_table[] = { { .compatible = "marvell,armadaxp-thermal", @@ -247,6 +283,10 @@ static const struct of_device_id armada_thermal_id_table[] = { .compatible = "marvell,armada380-thermal", .data = &armada380_data, }, + { + .compatible = "marvell,armada-ap806-thermal", + .data = &armada_ap806_data, + }, { /* sentinel */ },