From patchwork Wed Mar 20 22:36:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 2310011 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 203F640213 for ; Wed, 20 Mar 2013 22:44:18 +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 1UIRhS-0004Z4-Jh; Wed, 20 Mar 2013 22:41:38 +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 1UIRdG-0002TU-Be for linux-arm-kernel@lists.infradead.org; Wed, 20 Mar 2013 22:37:19 +0000 Received: by mail.free-electrons.com (Postfix, from userid 106) id 724887D1; Wed, 20 Mar 2013 23:37:17 +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 2D74D7D1; Wed, 20 Mar 2013 23:37:12 +0100 (CET) From: Ezequiel Garcia To: Subject: [PATCH 08/16] thermal: mvebu: Fix temperature output formula for kirkwood Date: Wed, 20 Mar 2013 19:36:29 -0300 Message-Id: <1363818997-23137-9-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_183718_540007_AF91E8DB X-CRM114-Status: UNSURE ( 9.68 ) X-CRM114-Notice: Please train this message. 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 temperature formula was taken from the Armada 510 datasheet. This is wrong because the Kirkwood SoC thermal sensor has different coefficients. Fix it using values from 88F682/88F683 Kirkwood datasheet. Signed-off-by: Ezequiel Garcia --- drivers/thermal/mvebu_thermal.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/drivers/thermal/mvebu_thermal.c b/drivers/thermal/mvebu_thermal.c index 5886a9c..ed4c9b0 100644 --- a/drivers/thermal/mvebu_thermal.c +++ b/drivers/thermal/mvebu_thermal.c @@ -48,14 +48,9 @@ static int mvebu_get_temp(struct thermal_zone_device *thermal, return -EIO; } - /* - * Calculate temperature. See Section 8.10.1 of the 88AP510, - * datasheet, which has the same sensor. - * Documentation/arm/Marvell/README - */ reg = (reg >> KIRKWOOD_THERMAL_TEMP_OFFSET) & KIRKWOOD_THERMAL_TEMP_MASK; - *temp = ((2281638UL - (7298*reg)) / 10); + *temp = ((2363302UL - (7339*reg)) / 10); return 0; }