From patchwork Sun Oct 22 08:54:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 116631 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp3456591qgn; Sun, 22 Oct 2017 01:57:39 -0700 (PDT) X-Received: by 10.84.178.37 with SMTP id y34mr4221602plb.99.1508662659258; Sun, 22 Oct 2017 01:57:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508662659; cv=none; d=google.com; s=arc-20160816; b=sPVoyhginRv+CLLKWNpIu9iYHKbMnqA1VtmDN5uSNDWf5givirXAJvzmDEvDcFBzlJ AkkHHDs9a1HsJKnxlLQ/EBy64d7pq+RoidNzypq3xCLVOZ8CHcE+eVpXabc4v53IE/Wh ek9h+kLDK/8kwMJyGjd7KOvtlW3G8IWlVBkkLNa9xjXVOelD20klolXGjmHJp+NP/JuP 1ZznOaTmDi+hWhzvTq3+6bM4SXwyXYkc+uzbq2wT+/O91vbcGSmORT3kvFjTGL0Er/N7 MkeZH38O5D1YVjk8C1IvVSVrdstR9kwo2s+zjnDonPTx/7usdG5Peqe5HrblyGBxAbZv 1iKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=LCLK7pu2wZE8rYfD7zJV7uj1SakCL4JqpkUYsfr8Jz4=; b=dllp43zPQ7z6a+rXZdFcuHyp+xlrMVb/TQp6ym72xa18PMTzrPZMbphnSDJPL/OC6H fPfuOfzbTvVWL+/NKx/oon8QxJrWf2kE7RVd9mGieb3Fsx2+u8LV/9GNpsyJM6H0jr1f FXopX6l+4HsWavqkqXg3PH0YuwkT0oPPgLCTd9vGJOnMYWNw7xEg+527XddYISRv6rMz 2STr72xomKOk2cvfDDY56ZE8LeJCtllLlLHK0M/jp7WQsXRqAeKXgbt8PNu8omG/tQ1l jHzv7a5y3gMD2qFNgCkJ3O7dYDO8o1WEN2K0pHKtrhD9Jkxtm8c5DymWlOzS9aWzLRTM Whiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=R3Cs6jq+; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x66si3281415pgb.590.2017.10.22.01.57.39; Sun, 22 Oct 2017 01:57:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=R3Cs6jq+; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751638AbdJVI5i (ORCPT + 12 others); Sun, 22 Oct 2017 04:57:38 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:57056 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751398AbdJVI4o (ORCPT ); Sun, 22 Oct 2017 04:56:44 -0400 Received: by mail-wm0-f66.google.com with SMTP id l68so4579472wmd.5 for ; Sun, 22 Oct 2017 01:56:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LCLK7pu2wZE8rYfD7zJV7uj1SakCL4JqpkUYsfr8Jz4=; b=R3Cs6jq+sdXLoewwtf2wkJ7shg5hcV+sZF67Tp4Li4yZzky3dnWwQDq182SJGJaeRN e7jZHmcsmz2gucrPCbZ6UhQyx1uzGk2eEcgej0flYhFyb1NLniCgb8BrNx46E+l6ejlQ 4saPgTfYZ6uMForObaH7cKWiyKXZ5DlzyjzCY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LCLK7pu2wZE8rYfD7zJV7uj1SakCL4JqpkUYsfr8Jz4=; b=QAiC8yx2kC37MwNW5PypQGnNpfVLdqWbj/Uqz7nBqswDt9BxKE/iqTCVs9al3SNQ2i p+IzwqEuJdnQRmGTpHDNGcmxy+v/iV3DMS6CVWrdpBplScrcPS6BGS3c6WisT9fwTmHm /hjMqmmHs87c+3hOGR4yL1+WN+iZe5ObJ3YOodvWlgfvI6c2r4bBD8glNYe7TiaiqFMI Ndt79NrMSMtKZVaGSOvFS4D1f5VC65XsvdIoQgNbJiFmkMtVeazc5WpPhv0im+Za2ItQ g3NaCWEZzcRdDsLJ6MoK8BEqpgj+QSu8FeNO/yttnszX96a15gtidbnjJwY4c3LhM/Yj yr4A== X-Gm-Message-State: AMCzsaUbctEt764nyWaNPbd9capLR4aaEuqda6xOvQbsfdsk7jt7q3CU w/vtEOGiJXJrt2FAK73xZ1bnOQ== X-Google-Smtp-Source: ABhQp+Q2Dw52VAzbIy5U168C3rkNVDYeqWJkyPNYD0n8rLuVaTtgMmozQHTC7ul5nIbSZ1HA0wG1WA== X-Received: by 10.28.10.147 with SMTP id 141mr2095430wmk.40.1508662603595; Sun, 22 Oct 2017 01:56:43 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:879a:6cd0:e9f1:dbdd:7436:9f6d]) by smtp.gmail.com with ESMTPSA id v8sm2701809wrg.80.2017.10.22.01.56.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 22 Oct 2017 01:56:43 -0700 (PDT) From: Daniel Lezcano To: edubezval@gmail.com Cc: daniel.lezcano@linaro.org, rui.zhang@intel.com, kevin.wangtao@linaro.org, leo.yan@linaro.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH V3 1/4] thermal/drivers/hisi: Put platform code together Date: Sun, 22 Oct 2017 10:54:32 +0200 Message-Id: <1508662475-6763-2-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508662475-6763-1-git-send-email-daniel.lezcano@linaro.org> References: <1508662475-6763-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org From: Kevin Wangtao Reorganize the code for next patches by moving the functions upper in the file which will prevent a forward declaration. There is no functional change here. Signed-off-by: Kevin Wangtao Tested-by: Daniel Lezcano # hikey6220 Signed-off-by: Daniel Lezcano --- drivers/thermal/hisi_thermal.c | 76 +++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 38 deletions(-) -- 2.7.4 diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c index b48e47e..ffa00b4 100644 --- a/drivers/thermal/hisi_thermal.c +++ b/drivers/thermal/hisi_thermal.c @@ -201,6 +201,44 @@ static void hisi_thermal_disable_sensor(struct hisi_thermal_data *data) clk_disable_unprepare(data->clk); } +static int hisi_thermal_setup(struct hisi_thermal_data *data) +{ + struct hisi_thermal_sensor *sensor = &data->sensor; + int ret; + + /* enable clock for tsensor */ + ret = clk_prepare_enable(data->clk); + if (ret) + return ret; + + /* disable module firstly */ + hisi_thermal_reset_enable(data->regs, 0); + hisi_thermal_enable(data->regs, 0); + + /* select sensor id */ + hisi_thermal_sensor_select(data->regs, sensor->id); + + /* setting the hdak time */ + hisi_thermal_hdak_set(data->regs, 0); + + /* setting lag value between current temp and the threshold */ + hisi_thermal_set_lag(data->regs, HISI_TEMP_LAG); + + /* enable for interrupt */ + hisi_thermal_alarm_set(data->regs, sensor->thres_temp); + + hisi_thermal_reset_set(data->regs, HISI_TEMP_RESET); + + /* enable module */ + hisi_thermal_reset_enable(data->regs, 1); + hisi_thermal_enable(data->regs, 1); + + hisi_thermal_alarm_clear(data->regs, 0); + hisi_thermal_alarm_enable(data->regs, 1); + + return 0; +} + static int hisi_thermal_get_temp(void *__data, int *temp) { struct hisi_thermal_data *data = __data; @@ -291,44 +329,6 @@ static void hisi_thermal_toggle_sensor(struct hisi_thermal_sensor *sensor, on ? THERMAL_DEVICE_ENABLED : THERMAL_DEVICE_DISABLED); } -static int hisi_thermal_setup(struct hisi_thermal_data *data) -{ - struct hisi_thermal_sensor *sensor = &data->sensor; - int ret; - - /* enable clock for tsensor */ - ret = clk_prepare_enable(data->clk); - if (ret) - return ret; - - /* disable module firstly */ - hisi_thermal_reset_enable(data->regs, 0); - hisi_thermal_enable(data->regs, 0); - - /* select sensor id */ - hisi_thermal_sensor_select(data->regs, sensor->id); - - /* setting the hdak time */ - hisi_thermal_hdak_set(data->regs, 0); - - /* setting lag value between current temp and the threshold */ - hisi_thermal_set_lag(data->regs, HISI_TEMP_LAG); - - /* enable for interrupt */ - hisi_thermal_alarm_set(data->regs, sensor->thres_temp); - - hisi_thermal_reset_set(data->regs, HISI_TEMP_RESET); - - /* enable module */ - hisi_thermal_reset_enable(data->regs, 1); - hisi_thermal_enable(data->regs, 1); - - hisi_thermal_alarm_clear(data->regs, 0); - hisi_thermal_alarm_enable(data->regs, 1); - - return 0; -} - static int hisi_thermal_probe(struct platform_device *pdev) { struct hisi_thermal_data *data; From patchwork Sun Oct 22 08:54:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 116628 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp3456199qgn; Sun, 22 Oct 2017 01:56:55 -0700 (PDT) X-Received: by 10.159.233.137 with SMTP id bh9mr837831plb.201.1508662615353; Sun, 22 Oct 2017 01:56:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508662615; cv=none; d=google.com; s=arc-20160816; b=Q9jV12ZQ533NRKCcINASGAGzhOAl/XsCN4YcJF1E4t0Xqn0YXK3jpg3U4/Ygy8BmNM EUVYmTFTSeJcU4pNjPZsi31p3GiDdJYr1t3D4mU8RNQ12B5+6R2j8tk8Ym3qu5aUSXUZ zdJYZ/ZOEz7GzjeACXoHqEGenAYvqRqao5yRb8dDMeD8KXGf7+pJzBAyOnpxL5ErdWTP LlIXQ7HkvgIa71LWc7qq70dKW7zbdrO0LHVNiB5xEfqHDFJ82i0iRt0ibI1ejX+My4LE AZNhf6oxwcIQbDsYfKnoDLP5SuCCbtEeyPvbwHcUR/FElauGi6eRT5uBDLOChp840Sts +VSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=2CVH90wqDpUEIzaTPGvH2ysMx8WY/G/LyGr3vvGEauQ=; b=DhcHCfb21eiXnQxG4lV46ZnvmHnMAW7Gb1+8vJPjKE9hiSlmqYGuaApCsFaNLiU7U2 JF4H0YxDxMCzIDuam/yZAmFihiCtyxNw0lhfbPXjLm1QOWVWsXNkgXzKcdZelbqhfClX zg/XLG4GTuoBOz8FhqEARE+d1WMSc9mimtYn2Eb+AiFQrue3u/BBVY+HDIdkPawOAD60 /owp0j7kbicI8QRy/5UM1Ge8g3ApflRz6glaNpo6U5yKN9S1zID5lO8aZ5jK3dQuCZC8 rOq/fX3IVdLDRf9S0+/Myy8F3GpcklGMzrHupv/5HZtPAJ6s9+T0plQDEpzoLtl9BJ3z 2Uaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=La0IBD2z; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j70si3523506pfj.558.2017.10.22.01.56.55; Sun, 22 Oct 2017 01:56:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=La0IBD2z; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751516AbdJVI4v (ORCPT + 12 others); Sun, 22 Oct 2017 04:56:51 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:43142 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751376AbdJVI4q (ORCPT ); Sun, 22 Oct 2017 04:56:46 -0400 Received: by mail-wm0-f67.google.com with SMTP id m72so5122131wmc.0 for ; Sun, 22 Oct 2017 01:56:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2CVH90wqDpUEIzaTPGvH2ysMx8WY/G/LyGr3vvGEauQ=; b=La0IBD2zJ48aDJ0p1kAnC1mT15VGSitArJYtsfjQ78oTwSGqOKnSPc04/olc63kVjp dj83SpPGpHfjDi5BkD5SmXXLB935rW135/Cf2CDCwW0nu97gTBsreoZSazRzrDM+IZwN 1iqYfIDfvt4Oc6BfiSZ1Bei30HZVmcT7xAHfk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2CVH90wqDpUEIzaTPGvH2ysMx8WY/G/LyGr3vvGEauQ=; b=jZuwWpwRv5FpTdfmjlHDLGIhMSoRSrG/qRECgHzUOX+eVT/5zDKy+PNcCic3/p2Z1+ Vekh6le96D5oBR63ARa8nbzUQRMGTWCFKY78c93pHlkWQTB0N5M7QTOjTVg/teM0eiwC QlKT/LTTqcygyYKG/6fkz/PzoKpNVAXEy6FjCkg58dAMlLF1hQFsiKaqByLeiKqSjc// C6Z1yLwRqM8Bls0aPgQxl7S892CJy8agtHRtDw/viZ3CnZDzYso8kHxGLke6oKjT0G41 po6EoSYaEaSsWUGeMpnLMLHLXMbj4Wh56jpS/GEFdNfydC5PAWlMSB2x53NiSS+PY8SS wQaQ== X-Gm-Message-State: AMCzsaX/DQwxSnXbCaUnxH8x4W7dJyEi0cUlqzTGzuenJdz1a2NMEJe3 gHU+zsgwhdHEpc0uLKK1kDXYPw== X-Google-Smtp-Source: ABhQp+RPsJVo/83yjQFB37plKrw1Enl8EBvR9SusKgrGb2sJwivEdNDJ8WFihfKuOSD/q3jzA5FQsA== X-Received: by 10.28.58.81 with SMTP id h78mr2965586wma.10.1508662605252; Sun, 22 Oct 2017 01:56:45 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:879a:6cd0:e9f1:dbdd:7436:9f6d]) by smtp.gmail.com with ESMTPSA id v8sm2701809wrg.80.2017.10.22.01.56.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 22 Oct 2017 01:56:44 -0700 (PDT) From: Daniel Lezcano To: edubezval@gmail.com Cc: daniel.lezcano@linaro.org, rui.zhang@intel.com, kevin.wangtao@linaro.org, leo.yan@linaro.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH V3 2/4] thermal/drivers/hisi: Add platform prefix to function name Date: Sun, 22 Oct 2017 10:54:33 +0200 Message-Id: <1508662475-6763-3-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508662475-6763-1-git-send-email-daniel.lezcano@linaro.org> References: <1508662475-6763-1-git-send-email-daniel.lezcano@linaro.org> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org From: Kevin Wangtao As the next patches will provide support for the hikey3660's sensor, several functions with the same purpose but for different platforms will be introduced. In order to make a clear distinction between them, let's prefix the function names with the platform name. This patch has no functional changes, only name changes. Signed-off-by: Kevin Wangtao Tested-by: Daniel Lezcano # hikey6220 Signed-off-by: Daniel Lezcano --- drivers/thermal/hisi_thermal.c | 145 +++++++++++++++++++++-------------------- 1 file changed, 73 insertions(+), 72 deletions(-) -- 2.7.4 diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c index ffa00b4..a0c0bb9 100644 --- a/drivers/thermal/hisi_thermal.c +++ b/drivers/thermal/hisi_thermal.c @@ -26,25 +26,24 @@ #include "thermal_core.h" -#define TEMP0_LAG (0x0) -#define TEMP0_TH (0x4) -#define TEMP0_RST_TH (0x8) -#define TEMP0_CFG (0xC) -#define TEMP0_CFG_SS_MSK (0xF000) -#define TEMP0_CFG_HDAK_MSK (0x30) -#define TEMP0_EN (0x10) -#define TEMP0_INT_EN (0x14) -#define TEMP0_INT_CLR (0x18) -#define TEMP0_RST_MSK (0x1C) -#define TEMP0_VALUE (0x28) - -#define HISI_TEMP_BASE (-60000) -#define HISI_TEMP_RESET (100000) -#define HISI_TEMP_STEP (785) -#define HISI_TEMP_LAG (3500) - -#define HISI_MAX_SENSORS 4 -#define HISI_DEFAULT_SENSOR 2 +#define HI6220_TEMP0_LAG (0x0) +#define HI6220_TEMP0_TH (0x4) +#define HI6220_TEMP0_RST_TH (0x8) +#define HI6220_TEMP0_CFG (0xC) +#define HI6220_TEMP0_CFG_SS_MSK (0xF000) +#define HI6220_TEMP0_CFG_HDAK_MSK (0x30) +#define HI6220_TEMP0_EN (0x10) +#define HI6220_TEMP0_INT_EN (0x14) +#define HI6220_TEMP0_INT_CLR (0x18) +#define HI6220_TEMP0_RST_MSK (0x1C) +#define HI6220_TEMP0_VALUE (0x28) + +#define HI6220_TEMP_BASE (-60000) +#define HI6220_TEMP_RESET (100000) +#define HI6220_TEMP_STEP (785) +#define HI6220_TEMP_LAG (3500) + +#define HI6220_DEFAULT_SENSOR 2 struct hisi_thermal_sensor { struct thermal_zone_device *tzd; @@ -78,14 +77,14 @@ struct hisi_thermal_data { * steps = (Temp - TempBase) / 785 * */ -static inline int hisi_thermal_step_to_temp(int step) +static inline int hi6220_thermal_step_to_temp(int step) { - return HISI_TEMP_BASE + (step * HISI_TEMP_STEP); + return HI6220_TEMP_BASE + (step * HI6220_TEMP_STEP); } -static inline int hisi_thermal_temp_to_step(int temp) +static inline int hi6220_thermal_temp_to_step(int temp) { - return DIV_ROUND_UP(temp - HISI_TEMP_BASE, HISI_TEMP_STEP); + return DIV_ROUND_UP(temp - HI6220_TEMP_BASE, HI6220_TEMP_STEP); } /* @@ -112,51 +111,53 @@ static inline int hisi_thermal_temp_to_step(int temp) * * [0:4] : lag register * - * The temperature is coded in steps, cf. HISI_TEMP_STEP. + * The temperature is coded in steps, cf. HI6220_TEMP_STEP. * * Min : 0x00 : 0.0 °C * Max : 0x1F : 24.3 °C * * The 'value' parameter is in milliCelsius. */ -static inline void hisi_thermal_set_lag(void __iomem *addr, int value) +static inline void hi6220_thermal_set_lag(void __iomem *addr, int value) { - writel(DIV_ROUND_UP(value, HISI_TEMP_STEP) & 0x1F, addr + TEMP0_LAG); + writel(DIV_ROUND_UP(value, HI6220_TEMP_STEP) & 0x1F, + addr + HI6220_TEMP0_LAG); } -static inline void hisi_thermal_alarm_clear(void __iomem *addr, int value) +static inline void hi6220_thermal_alarm_clear(void __iomem *addr, int value) { - writel(value, addr + TEMP0_INT_CLR); + writel(value, addr + HI6220_TEMP0_INT_CLR); } -static inline void hisi_thermal_alarm_enable(void __iomem *addr, int value) +static inline void hi6220_thermal_alarm_enable(void __iomem *addr, int value) { - writel(value, addr + TEMP0_INT_EN); + writel(value, addr + HI6220_TEMP0_INT_EN); } -static inline void hisi_thermal_alarm_set(void __iomem *addr, int temp) +static inline void hi6220_thermal_alarm_set(void __iomem *addr, int temp) { - writel(hisi_thermal_temp_to_step(temp) | 0x0FFFFFF00, addr + TEMP0_TH); + writel(hi6220_thermal_temp_to_step(temp) | 0x0FFFFFF00, + addr + HI6220_TEMP0_TH); } -static inline void hisi_thermal_reset_set(void __iomem *addr, int temp) +static inline void hi6220_thermal_reset_set(void __iomem *addr, int temp) { - writel(hisi_thermal_temp_to_step(temp), addr + TEMP0_RST_TH); + writel(hi6220_thermal_temp_to_step(temp), addr + HI6220_TEMP0_RST_TH); } -static inline void hisi_thermal_reset_enable(void __iomem *addr, int value) +static inline void hi6220_thermal_reset_enable(void __iomem *addr, int value) { - writel(value, addr + TEMP0_RST_MSK); + writel(value, addr + HI6220_TEMP0_RST_MSK); } -static inline void hisi_thermal_enable(void __iomem *addr, int value) +static inline void hi6220_thermal_enable(void __iomem *addr, int value) { - writel(value, addr + TEMP0_EN); + writel(value, addr + HI6220_TEMP0_EN); } -static inline int hisi_thermal_get_temperature(void __iomem *addr) +static inline int hi6220_thermal_get_temperature(void __iomem *addr) { - return hisi_thermal_step_to_temp(readl(addr + TEMP0_VALUE)); + return hi6220_thermal_step_to_temp(readl(addr + HI6220_TEMP0_VALUE)); } /* @@ -169,10 +170,10 @@ static inline int hisi_thermal_get_temperature(void __iomem *addr) * 0x2: remote sensor 2 (ACPU cluster 0) * 0x3: remote sensor 3 (G3D) */ -static inline void hisi_thermal_sensor_select(void __iomem *addr, int sensor) +static inline void hi6220_thermal_sensor_select(void __iomem *addr, int sensor) { - writel((readl(addr + TEMP0_CFG) & ~TEMP0_CFG_SS_MSK) | - (sensor << 12), addr + TEMP0_CFG); + writel((readl(addr + HI6220_TEMP0_CFG) & ~HI6220_TEMP0_CFG_SS_MSK) | + (sensor << 12), addr + HI6220_TEMP0_CFG); } /* @@ -185,23 +186,23 @@ static inline void hisi_thermal_sensor_select(void __iomem *addr, int sensor) * 0x2 : 49.152 ms * 0x3 : 393.216 ms */ -static inline void hisi_thermal_hdak_set(void __iomem *addr, int value) +static inline void hi6220_thermal_hdak_set(void __iomem *addr, int value) { - writel((readl(addr + TEMP0_CFG) & ~TEMP0_CFG_HDAK_MSK) | - (value << 4), addr + TEMP0_CFG); + writel((readl(addr + HI6220_TEMP0_CFG) & ~HI6220_TEMP0_CFG_HDAK_MSK) | + (value << 4), addr + HI6220_TEMP0_CFG); } -static void hisi_thermal_disable_sensor(struct hisi_thermal_data *data) +static void hi6220_thermal_disable_sensor(struct hisi_thermal_data *data) { /* disable sensor module */ - hisi_thermal_enable(data->regs, 0); - hisi_thermal_alarm_enable(data->regs, 0); - hisi_thermal_reset_enable(data->regs, 0); + hi6220_thermal_enable(data->regs, 0); + hi6220_thermal_alarm_enable(data->regs, 0); + hi6220_thermal_reset_enable(data->regs, 0); clk_disable_unprepare(data->clk); } -static int hisi_thermal_setup(struct hisi_thermal_data *data) +static int hi6220_thermal_enable_sensor(struct hisi_thermal_data *data) { struct hisi_thermal_sensor *sensor = &data->sensor; int ret; @@ -212,29 +213,29 @@ static int hisi_thermal_setup(struct hisi_thermal_data *data) return ret; /* disable module firstly */ - hisi_thermal_reset_enable(data->regs, 0); - hisi_thermal_enable(data->regs, 0); + hi6220_thermal_reset_enable(data->regs, 0); + hi6220_thermal_enable(data->regs, 0); /* select sensor id */ - hisi_thermal_sensor_select(data->regs, sensor->id); + hi6220_thermal_sensor_select(data->regs, sensor->id); /* setting the hdak time */ - hisi_thermal_hdak_set(data->regs, 0); + hi6220_thermal_hdak_set(data->regs, 0); /* setting lag value between current temp and the threshold */ - hisi_thermal_set_lag(data->regs, HISI_TEMP_LAG); + hi6220_thermal_set_lag(data->regs, HI6220_TEMP_LAG); /* enable for interrupt */ - hisi_thermal_alarm_set(data->regs, sensor->thres_temp); + hi6220_thermal_alarm_set(data->regs, sensor->thres_temp); - hisi_thermal_reset_set(data->regs, HISI_TEMP_RESET); + hi6220_thermal_reset_set(data->regs, HI6220_TEMP_RESET); /* enable module */ - hisi_thermal_reset_enable(data->regs, 1); - hisi_thermal_enable(data->regs, 1); + hi6220_thermal_reset_enable(data->regs, 1); + hi6220_thermal_enable(data->regs, 1); - hisi_thermal_alarm_clear(data->regs, 0); - hisi_thermal_alarm_enable(data->regs, 1); + hi6220_thermal_alarm_clear(data->regs, 0); + hi6220_thermal_alarm_enable(data->regs, 1); return 0; } @@ -244,7 +245,7 @@ static int hisi_thermal_get_temp(void *__data, int *temp) struct hisi_thermal_data *data = __data; struct hisi_thermal_sensor *sensor = &data->sensor; - *temp = hisi_thermal_get_temperature(data->regs); + *temp = hi6220_thermal_get_temperature(data->regs); dev_dbg(&data->pdev->dev, "id=%d, temp=%d, thres=%d\n", sensor->id, *temp, sensor->thres_temp); @@ -260,11 +261,11 @@ static irqreturn_t hisi_thermal_alarm_irq_thread(int irq, void *dev) { struct hisi_thermal_data *data = dev; struct hisi_thermal_sensor *sensor = &data->sensor; - int temp; + int temp = 0; - hisi_thermal_alarm_clear(data->regs, 1); + hi6220_thermal_alarm_clear(data->regs, 1); - temp = hisi_thermal_get_temperature(data->regs); + hisi_thermal_get_temp(data, &temp); if (temp >= sensor->thres_temp) { dev_crit(&data->pdev->dev, "THERMAL ALARM: %d > %d\n", @@ -273,7 +274,7 @@ static irqreturn_t hisi_thermal_alarm_irq_thread(int irq, void *dev) thermal_zone_device_update(data->sensor.tzd, THERMAL_EVENT_UNSPECIFIED); - } else if (temp < sensor->thres_temp) { + } else { dev_crit(&data->pdev->dev, "THERMAL ALARM stopped: %d < %d\n", temp, sensor->thres_temp); } @@ -365,14 +366,14 @@ static int hisi_thermal_probe(struct platform_device *pdev) ret = hisi_thermal_register_sensor(pdev, data, &data->sensor, - HISI_DEFAULT_SENSOR); + HI6220_DEFAULT_SENSOR); if (ret) { dev_err(&pdev->dev, "failed to register thermal sensor: %d\n", ret); return ret; } - ret = hisi_thermal_setup(data); + ret = hi6220_thermal_enable_sensor(data); if (ret) { dev_err(&pdev->dev, "Failed to setup the sensor: %d\n", ret); return ret; @@ -397,7 +398,7 @@ static int hisi_thermal_remove(struct platform_device *pdev) struct hisi_thermal_sensor *sensor = &data->sensor; hisi_thermal_toggle_sensor(sensor, false); - hisi_thermal_disable_sensor(data); + hi6220_thermal_disable_sensor(data); return 0; } @@ -407,7 +408,7 @@ static int hisi_thermal_suspend(struct device *dev) { struct hisi_thermal_data *data = dev_get_drvdata(dev); - hisi_thermal_disable_sensor(data); + hi6220_thermal_disable_sensor(data); return 0; } @@ -416,7 +417,7 @@ static int hisi_thermal_resume(struct device *dev) { struct hisi_thermal_data *data = dev_get_drvdata(dev); - return hisi_thermal_setup(data); + return hi6220_thermal_enable_sensor(data); } #endif