From patchwork Wed Mar 20 22:36:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 2309851 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id B57A3DF24C for ; Wed, 20 Mar 2013 22:37:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751544Ab3CTWhX (ORCPT ); Wed, 20 Mar 2013 18:37:23 -0400 Received: from mail.free-electrons.com ([94.23.35.102]:50616 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751151Ab3CTWhW (ORCPT ); Wed, 20 Mar 2013 18:37:22 -0400 Received: by mail.free-electrons.com (Postfix, from userid 106) id ED2BC863; Wed, 20 Mar 2013 23:37:21 +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 A042F7D4; Wed, 20 Mar 2013 23:37:17 +0100 (CET) From: Ezequiel Garcia To: Cc: Zhang Rui , , Thomas Petazzoni , Gregory Clement , Nobuhiro Iwamatsu , Andrew Lunn , Jason Cooper , Florian Fainelli , Sebastian Hesselbarth , Lior Amsalem , Ezequiel Garcia Subject: [PATCH 09/16] thermal: mvebu: Rename kirkwood definitions to mvebu Date: Wed, 20 Mar 2013 19:36:30 -0300 Message-Id: <1363818997-23137-10-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> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org This definitions will be also valid for other SoC, such as Armada 370 and Armada XP. Therefore we rename them as 'mvebu'. Signed-off-by: Ezequiel Garcia --- drivers/thermal/mvebu_thermal.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/thermal/mvebu_thermal.c b/drivers/thermal/mvebu_thermal.c index ed4c9b0..3304057 100644 --- a/drivers/thermal/mvebu_thermal.c +++ b/drivers/thermal/mvebu_thermal.c @@ -22,10 +22,10 @@ #include #include -#define KIRKWOOD_THERMAL_VALID_OFFSET 9 -#define KIRKWOOD_THERMAL_VALID_MASK 0x1 -#define KIRKWOOD_THERMAL_TEMP_OFFSET 10 -#define KIRKWOOD_THERMAL_TEMP_MASK 0x1FF +#define MVEBU_THERMAL_VALID_OFFSET 9 +#define MVEBU_THERMAL_VALID_MASK 0x1 +#define MVEBU_THERMAL_TEMP_OFFSET 10 +#define MVEBU_THERMAL_TEMP_MASK 0x1FF /* Marvell EBU Thermal Sensor Dev Structure */ struct mvebu_thermal_priv { @@ -41,15 +41,15 @@ static int mvebu_get_temp(struct thermal_zone_device *thermal, reg = readl_relaxed(priv->sensor); /* Valid check */ - if (!((reg >> KIRKWOOD_THERMAL_VALID_OFFSET) & - KIRKWOOD_THERMAL_VALID_MASK)) { + if (!((reg >> MVEBU_THERMAL_VALID_OFFSET) & + MVEBU_THERMAL_VALID_MASK)) { dev_err(&thermal->device, "Temperature sensor reading not valid\n"); return -EIO; } - reg = (reg >> KIRKWOOD_THERMAL_TEMP_OFFSET) & - KIRKWOOD_THERMAL_TEMP_MASK; + reg = (reg >> MVEBU_THERMAL_TEMP_OFFSET) & + MVEBU_THERMAL_TEMP_MASK; *temp = ((2363302UL - (7339*reg)) / 10); return 0;