From patchwork Fri Oct 20 15:11:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 116508 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp1799856qgn; Fri, 20 Oct 2017 08:13:18 -0700 (PDT) X-Received: by 10.101.77.74 with SMTP id j10mr4781907pgt.324.1508512398536; Fri, 20 Oct 2017 08:13:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508512398; cv=none; d=google.com; s=arc-20160816; b=djlWwkbpN3zBWYyGdM/jvFrKtghMkqjBNKvGSTV4XXR/K6HTBPB8EP0tkSsN9CYNLR m0gZn5Zikoz/ryOfxg1U2n9Zbv2vlA0/vJAd4rmz1WsyQ/Sm3lPo+c8CO4WOASG7Cne9 kwDyoE0FG4mWxDabp0FQ6I/Pw2K+3xMADlPrSgTiJdEomyu6/JNF2mzJAm23HwiVccmW x3TrH0ZuBKbdU6guSlUvK1G9eosRtCmh4hz/yksEkjqOo9E6oYQlD6ckRCcsVpHX6u4E jfCihYUzL8P07iamRgTiYzCVakJ1xvXOPexf73ckbyKR1ptqGhVyABbpq5CDApeU8W8i xBlQ== 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=BB2xNdqdACcC2Wvys6dJDSyn31BzqU0HylWuXf5B9S+r3hF0PpoLTMx8CC6I/UOZaA A2CAzZHp1DR7GihjGuj7ZG+kqqht88MHAsfRatQLHSAakr2sgdU1Qxdky/do/RFHdra3 8+5za2t8bIqQYYSdVtZiVBn6OE3JZwfWh2eiRnvpYnFinHIjPPOnuQL/wPT/HNuMa7pd jF/mz4UEP0r4S0v+WDXFwfmzT82BwSi5jP0pZbmDpyu3LVLsOl/AQAoC7hbg0rtib8Pd ITn8EppGGQTaYCktG3+IZkTb/yJPG8G2v2yB5O3eTuKiymNnStKWkq4VPi4gEqpoLKHi Y/bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MvbYRQng; 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 x5si904494pfx.187.2017.10.20.08.13.17; Fri, 20 Oct 2017 08:13:18 -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=MvbYRQng; 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 S1752031AbdJTPNQ (ORCPT + 12 others); Fri, 20 Oct 2017 11:13:16 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:54971 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752082AbdJTPNO (ORCPT ); Fri, 20 Oct 2017 11:13:14 -0400 Received: by mail-wm0-f65.google.com with SMTP id r68so3610343wmr.3 for ; Fri, 20 Oct 2017 08:13:14 -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=MvbYRQngN+o16XFR8dQ/dNheCloQu9ahh7gfLIEtDn4/0REOzM9QRq3O/mbLR6Sc1o e5e1rnbS4/qyF+q1BmV6h2fIdJwKg70j/MsCrsWMQghD2hW/BesMgLynrYkItbsOCaAP aeGfHmnsOP7ledTP587TgRxwVMzdUdukQ9Gr0= 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=kmSuu0qWe4XdEBeWTAf0RddVIra0gqpPK8jbcfNKNsD6n1CdywDBfQBiaZMcCzGEHe FTC+Dgzz1S5eFd35ckV1PW3XQA3bmEc+H1cbpicpDGVjRj3tA51VoDDLk2aHeIV7mdEO TM/LQLOtkPMBm7L4QUvLDZdhJ2itTNsdfB2njbKSCtI+UVqEuCICB07jdYNFtiCryuT2 sc0TLa/YmaH6t+pQnl2ha/vx4LjEUwBn5UYtM7g4iZuuAwnl8x2b3ttHIgZRlRiitlfX /moqw0y2/Q1Hr1t9nxPqB4+T9O5YM+nk9pKE3FPHRs/8h+mzCDIA9HZqUZ7OQBPN13Nn +1YA== X-Gm-Message-State: AMCzsaVWDpekzBtgQG823jhnpZOSkzjge6jnfx9d7e5tFPJIigHrQrGm i4GTPgTlc4ZmQDC9ZMgZfL0C9w== X-Google-Smtp-Source: ABhQp+SB5JEVD2JwAczB4V3dQ1yVS5G7Q6d4vwbvu6aZKqp1VGszyGO20IYGIF9Rtg4k7DdlfZCkRw== X-Received: by 10.28.29.68 with SMTP id d65mr1978232wmd.93.1508512393489; Fri, 20 Oct 2017 08:13:13 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:879a:6cd0:3dc8:5a4d:8d23:3c7c]) by smtp.gmail.com with ESMTPSA id 4sm1249416wmm.1.2017.10.20.08.13.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Oct 2017 08:13:12 -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 V2 1/4] thermal/drivers/hisi: Put platform code together Date: Fri, 20 Oct 2017 17:11:04 +0200 Message-Id: <1508512267-18302-2-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508512267-18302-1-git-send-email-daniel.lezcano@linaro.org> References: <1508512267-18302-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 Fri Oct 20 15:11:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 116509 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp1799914qgn; Fri, 20 Oct 2017 08:13:22 -0700 (PDT) X-Received: by 10.159.194.196 with SMTP id u4mr4454009plz.49.1508512402054; Fri, 20 Oct 2017 08:13:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508512402; cv=none; d=google.com; s=arc-20160816; b=AQqYtWAvFcTgR+OOvp0OyT1txJCt1o4i1mM0C5Rx/1J3mYlaKpd3x3XSGP7SE8nAw2 n6N6N2Hzcf56TW8+N/QMrYFTBHbUAM2lbP2YN7qJpMBmVnrAOQbmIw+C5qXWFV7er2DE fDWwolhJdHixYiRUCz0mphxtgkVhPNIIlJQ8BPNvNPTwEdRTe82Bbdz6SXQ5s/9dzeYE iYNBPXrqZWpaOesqKDhJ/pw/NH7XotGmo8NqweKnTjWqyl6EhsYEaSnk67sGLXl6qgQT 1YkU3eODiP6gJyaNArOiVOqVJkyCx3nqjvcW3uLQTMJ7sqIkEMZ2/Bc4zOfOcVKjMBl9 0R3A== 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=Cb2d7qtpGBoNBRpLyqdrHr/5r8/U6R/5SRKjjI/5yhhDf2YVUyY9q03E6/1ob479AK X/WTIGbXZI3eSJi87uMFuwWHm6xk0X651CLLcokA1jVawLTnlbR17Bxhq5B4KIP91Cxj XBJLUVzh6e2nRA/qR3y97Uj2oP9jGImIQ3Ib5uTwkQIWJ7kY1r/BVJpWlnIowsNfk724 fdoYYuCnLKEH3FiHvPi4AbKvEMn5EtDmzZMq2aLIqIiqVmIDZG2dhNvhEbhRbor183ql T/NP+f1RJrKw+apW9gGa8r4khg89yQcH98kCdxqCVmrVGsS+vbxcb4uqdtrCJswGpD/b 3O+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=a4ZKSUpN; 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 v204si816247pgb.661.2017.10.20.08.13.21; Fri, 20 Oct 2017 08:13:22 -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=a4ZKSUpN; 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 S1752333AbdJTPNS (ORCPT + 12 others); Fri, 20 Oct 2017 11:13:18 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:51598 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752266AbdJTPNR (ORCPT ); Fri, 20 Oct 2017 11:13:17 -0400 Received: by mail-wr0-f193.google.com with SMTP id j14so11635660wre.8 for ; Fri, 20 Oct 2017 08:13:16 -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=a4ZKSUpNyyOwtDwqHv7+i5NrAumOxDR9qsW3kamoqzH5XshV95zkQxP/VrzEvsDBfH sxiD6+WHocP1YU4adDD2S5dt4X22QE8rBgx5/s89O1k9BW2/Q7g13foQtjvZzhyv6kgd IjNBRYMh/FPPiCysuJpXpqalppglUvYQ1RP4o= 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=f4f7MZxK/fAaGmPOoiTvbKyJ27Pj18aUU5X5zaK6gDO6PgOj3SZpEiKNO4L02+QZoj dt6rr00a6CcVMMQVOWl2V5wogHXtnWrySa9rT4NWqDSPRUAoYwDp1n9BAj2QaPQzA6xw nzUSlV1a82SeXMHv3BB2uu2fKLEQbuwJgA5bie5yZubB2slnGXsxMNrXyvoGhYBejkla QpL+dHWzPfadU+ahfWgJgE0n++14rJQG3zcvMKfv2KHYtVMzlowW7KvdyB7sQ7kxXbI2 jgukiIttHNe//ZxW+H6Jl4mmpHkwDKZ2z8yZHM/EK0Lg+9/uaaf6nwziEQlQ0s1hCOhM 0wSQ== X-Gm-Message-State: AMCzsaXlwJgpoAMwEmch901rxwNyoj7xS4VwY2zTYr8+c0Oeh1ExotSC Y+3yRKJko0Jx4gaVK75mkkPy+A== X-Google-Smtp-Source: ABhQp+Qk0/ts2WriPKS92Ziu6BOb5g8B1tfk8LY1AfLJLakkUMkB/JK38nXs22mo0VuLDvFicaDmnQ== X-Received: by 10.223.161.132 with SMTP id u4mr5099224wru.141.1508512395322; Fri, 20 Oct 2017 08:13:15 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:879a:6cd0:3dc8:5a4d:8d23:3c7c]) by smtp.gmail.com with ESMTPSA id 4sm1249416wmm.1.2017.10.20.08.13.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Oct 2017 08:13:14 -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 V2 2/4] thermal/drivers/hisi: Add platform prefix to function name Date: Fri, 20 Oct 2017 17:11:05 +0200 Message-Id: <1508512267-18302-3-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508512267-18302-1-git-send-email-daniel.lezcano@linaro.org> References: <1508512267-18302-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 From patchwork Fri Oct 20 15:11:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 116510 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp1799919qgn; Fri, 20 Oct 2017 08:13:22 -0700 (PDT) X-Received: by 10.98.79.200 with SMTP id f69mr5267324pfj.159.1508512402597; Fri, 20 Oct 2017 08:13:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508512402; cv=none; d=google.com; s=arc-20160816; b=Nk3eMCkn0JjcIOFcbERwwfwPnkzctcak1wpgjTORtPD0et1vkRMp5W+h/ZYwvk2uyu gBKux46H/U8OP0K10gdHiRGrC2+pkKQWmp2UBr0yE0g6NwdT6x+JUGAaLXgKzTz2uRtJ EaB8D0N8aZ+LMmNSKLHO5NUc1TLjeUFLo0SQDww1Br2AdqberFDQCXuiQnUgykXuNHbY +NdylUbow2NenYzaOmcfCxZdrzGqVWTdQExGIiaEQE+o88dJtbr8pU/5Cs9sdTNtD/5u +MI7h/k65ugKS7zTSg226zjAsl65jT7eJetT8PQ8/tzpYNCY4Aexf96R+iPJ3hfwgHtm NUoA== 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=78cux7gDTmBWsP+18f3UU6Ay5jdKI9iCcrPLoJTUBbI=; b=WgWEfvGEpKjfdTBSgTFh1IbKPdIuqOeJ9QxegbfoeRAs64Aq1hUFWXSeeOIiil9RH0 2QhkANoRoqTVSWpfYImviAysMgaNxfRF/9hpbmc3FaSMetUw+ZTIbpfYz8cOzTJE+2Su bEVF3/+j6BkxNBAZ0qN6GCobkUloRVsJAuiVV+LQMbLPx2KtuNbGEW2L6PXBdDveP107 wXkClT+DU7LixtZ34zBA3Ke8mXro4g3yRM8Vh7CS/DmqryyRXLLi/98dBFEWwUb+jpWs CjV1aGaND29maWdR7AVDfQ7h5sEwnN4Q30QoQQ6eb0BY+H3g5PnNQMbhvea9azk7N/Vi rCmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DVnI2JyZ; 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 v204si816247pgb.661.2017.10.20.08.13.22; Fri, 20 Oct 2017 08:13:22 -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=DVnI2JyZ; 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 S1751618AbdJTPNV (ORCPT + 12 others); Fri, 20 Oct 2017 11:13:21 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:43943 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752316AbdJTPNS (ORCPT ); Fri, 20 Oct 2017 11:13:18 -0400 Received: by mail-wr0-f195.google.com with SMTP id w105so2315460wrc.0 for ; Fri, 20 Oct 2017 08:13:17 -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=78cux7gDTmBWsP+18f3UU6Ay5jdKI9iCcrPLoJTUBbI=; b=DVnI2JyZY37qvX2DPbWhslnVdA2ZHKXZD54lQY0g8LRckH5J/CApTLS/ZJL1BNlT1w eDKUyfYY3Lv10JFlAFFgAlunjnRqLtuKUnbLMxUj6lHKAn3HLonRG+adS9mA2CP50b+Y t89y/2Q9pkxDw69cB2lb7sl5Uus58+iXMLnn8= 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=78cux7gDTmBWsP+18f3UU6Ay5jdKI9iCcrPLoJTUBbI=; b=cz9VB2CWTgjPrGHoopqon5yz9ZkAVgnfuXuBniNRrupnlUSraw/rqUhxmXmFOhuL2M IAfxjUZqX8tHfOKSiIuEanl/upjlqZksvZMdLo0eFUC9Vr/Q6/AwY7kB4NOYi4Npnt2z 4CtW4ep0idQGzJsNmCU2UZbOZS03mf5HVhRDqU6LEKxOHV6t/VYQrMPIn2z5fk5UdLPW tqSASCV1RI7K2+O4D4YfpARW/8D04l1qYEYZTB8F5XAq6kysL6TTPCo5nl00N+gyss9o fh6ZrMDoMtuEzAwainuDzfrpbhumts976XR/v1gWAJd2m5R8gR0ynwTCdkV5DsbhsudG v3Rg== X-Gm-Message-State: AMCzsaW2OGfyVh8Odamuelgyr3Eor2oCf4XEpNF+z82e97I5TzkiV8ID Fjw0lxYFvd71In8v5cvZubaoc/8QPhc= X-Google-Smtp-Source: ABhQp+QW2N9VfFHAnRw/+3m6Hp9QYQToy1gxLSOLrIQR4D1knm9D4+82AzOIReIoObhlfNuSCt1Zdg== X-Received: by 10.223.197.141 with SMTP id m13mr5087280wrg.203.1508512397078; Fri, 20 Oct 2017 08:13:17 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:879a:6cd0:3dc8:5a4d:8d23:3c7c]) by smtp.gmail.com with ESMTPSA id 4sm1249416wmm.1.2017.10.20.08.13.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Oct 2017 08:13:16 -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 V2 3/4] thermal/drivers/hisi: Prepare to add support for other hisi platforms Date: Fri, 20 Oct 2017 17:11:06 +0200 Message-Id: <1508512267-18302-4-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508512267-18302-1-git-send-email-daniel.lezcano@linaro.org> References: <1508512267-18302-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 For platform compatibility, add the tsensor ops to a thermal data structure. Each platform has its own probe function to register proper tsensor ops function to the pointer, platform related resource request are also implemented in the platform probe function. Signed-off-by: Kevin Wangtao Tested-by: Daniel Lezcano # hikey6220 Signed-off-by: Daniel Lezcano --- drivers/thermal/hisi_thermal.c | 132 +++++++++++++++++++++++++++-------------- 1 file changed, 87 insertions(+), 45 deletions(-) -- 2.7.4 diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c index a0c0bb9..98a4403 100644 --- a/drivers/thermal/hisi_thermal.c +++ b/drivers/thermal/hisi_thermal.c @@ -23,6 +23,7 @@ #include #include #include +#include #include "thermal_core.h" @@ -30,7 +31,7 @@ #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_SS_MSK (0xF000) #define HI6220_TEMP0_CFG_HDAK_MSK (0x30) #define HI6220_TEMP0_EN (0x10) #define HI6220_TEMP0_INT_EN (0x14) @@ -41,7 +42,7 @@ #define HI6220_TEMP_BASE (-60000) #define HI6220_TEMP_RESET (100000) #define HI6220_TEMP_STEP (785) -#define HI6220_TEMP_LAG (3500) +#define HI6220_TEMP_LAG (3500) #define HI6220_DEFAULT_SENSOR 2 @@ -52,6 +53,10 @@ struct hisi_thermal_sensor { }; struct hisi_thermal_data { + int (*get_temp)(struct hisi_thermal_data *data); + int (*enable_sensor)(struct hisi_thermal_data *data); + int (*disable_sensor)(struct hisi_thermal_data *data); + int (*irq_handler)(struct hisi_thermal_data *data); struct platform_device *pdev; struct clk *clk; struct hisi_thermal_sensor sensor; @@ -192,7 +197,18 @@ static inline void hi6220_thermal_hdak_set(void __iomem *addr, int value) (value << 4), addr + HI6220_TEMP0_CFG); } -static void hi6220_thermal_disable_sensor(struct hisi_thermal_data *data) +static int hi6220_thermal_irq_handler(struct hisi_thermal_data *data) +{ + hi6220_thermal_alarm_clear(data->regs, 1); + return 0; +} + +static int hi6220_thermal_get_temp(struct hisi_thermal_data *data) +{ + return hi6220_thermal_get_temperature(data->regs); +} + +static int hi6220_thermal_disable_sensor(struct hisi_thermal_data *data) { /* disable sensor module */ hi6220_thermal_enable(data->regs, 0); @@ -200,6 +216,8 @@ static void hi6220_thermal_disable_sensor(struct hisi_thermal_data *data) hi6220_thermal_reset_enable(data->regs, 0); clk_disable_unprepare(data->clk); + + return 0; } static int hi6220_thermal_enable_sensor(struct hisi_thermal_data *data) @@ -240,12 +258,48 @@ static int hi6220_thermal_enable_sensor(struct hisi_thermal_data *data) return 0; } +static int hi6220_thermal_probe(struct hisi_thermal_data *data) +{ + struct platform_device *pdev = data->pdev; + struct device *dev = &pdev->dev; + struct resource *res; + int ret; + + data->get_temp = hi6220_thermal_get_temp; + data->enable_sensor = hi6220_thermal_enable_sensor; + data->disable_sensor = hi6220_thermal_disable_sensor; + data->irq_handler = hi6220_thermal_irq_handler; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + data->regs = devm_ioremap_resource(dev, res); + if (IS_ERR(data->regs)) { + dev_err(dev, "failed to get io address\n"); + return PTR_ERR(data->regs); + } + + data->clk = devm_clk_get(dev, "thermal_clk"); + if (IS_ERR(data->clk)) { + ret = PTR_ERR(data->clk); + if (ret != -EPROBE_DEFER) + dev_err(dev, "failed to get thermal clk: %d\n", ret); + return ret; + } + + data->irq = platform_get_irq(pdev, 0); + if (data->irq < 0) + return data->irq; + + data->sensor.id = HI6220_DEFAULT_SENSOR; + + return 0; +} + static int hisi_thermal_get_temp(void *__data, int *temp) { struct hisi_thermal_data *data = __data; struct hisi_thermal_sensor *sensor = &data->sensor; - *temp = hi6220_thermal_get_temperature(data->regs); + *temp = data->get_temp(data); dev_dbg(&data->pdev->dev, "id=%d, temp=%d, thres=%d\n", sensor->id, *temp, sensor->thres_temp); @@ -263,7 +317,7 @@ static irqreturn_t hisi_thermal_alarm_irq_thread(int irq, void *dev) struct hisi_thermal_sensor *sensor = &data->sensor; int temp = 0; - hi6220_thermal_alarm_clear(data->regs, 1); + data->irq_handler(data); hisi_thermal_get_temp(data, &temp); @@ -284,14 +338,11 @@ static irqreturn_t hisi_thermal_alarm_irq_thread(int irq, void *dev) static int hisi_thermal_register_sensor(struct platform_device *pdev, struct hisi_thermal_data *data, - struct hisi_thermal_sensor *sensor, - int index) + struct hisi_thermal_sensor *sensor) { int ret, i; const struct thermal_trip *trip; - sensor->id = index; - sensor->tzd = devm_thermal_zone_of_sensor_register(&pdev->dev, sensor->id, data, &hisi_of_thermal_ops); @@ -316,7 +367,7 @@ static int hisi_thermal_register_sensor(struct platform_device *pdev, } static const struct of_device_id of_hisi_thermal_match[] = { - { .compatible = "hisilicon,tsensor" }, + { .compatible = "hisilicon,tsensor", .data = hi6220_thermal_probe }, { /* end */ } }; MODULE_DEVICE_TABLE(of, of_hisi_thermal_match); @@ -333,58 +384,48 @@ static void hisi_thermal_toggle_sensor(struct hisi_thermal_sensor *sensor, static int hisi_thermal_probe(struct platform_device *pdev) { struct hisi_thermal_data *data; - struct resource *res; + int (*platform_probe)(struct hisi_thermal_data *); + struct device *dev = &pdev->dev; int ret; - data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); + data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); if (!data) return -ENOMEM; data->pdev = pdev; + platform_set_drvdata(pdev, data); - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - data->regs = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(data->regs)) { - dev_err(&pdev->dev, "failed to get io address\n"); - return PTR_ERR(data->regs); + platform_probe = of_device_get_match_data(dev); + if (!platform_probe) { + dev_err(dev, "failed to get probe func\n"); + return -EINVAL; } - data->irq = platform_get_irq(pdev, 0); - if (data->irq < 0) - return data->irq; - - platform_set_drvdata(pdev, data); - - data->clk = devm_clk_get(&pdev->dev, "thermal_clk"); - if (IS_ERR(data->clk)) { - ret = PTR_ERR(data->clk); - if (ret != -EPROBE_DEFER) - dev_err(&pdev->dev, - "failed to get thermal clk: %d\n", ret); + ret = platform_probe(data); + if (ret) return ret; - } ret = hisi_thermal_register_sensor(pdev, data, - &data->sensor, - HI6220_DEFAULT_SENSOR); + &data->sensor); if (ret) { - dev_err(&pdev->dev, "failed to register thermal sensor: %d\n", - ret); + dev_err(dev, "failed to register thermal sensor: %d\n", ret); return ret; } - ret = hi6220_thermal_enable_sensor(data); + ret = data->enable_sensor(data); if (ret) { - dev_err(&pdev->dev, "Failed to setup the sensor: %d\n", ret); + dev_err(dev, "Failed to setup the sensor: %d\n", ret); return ret; } - ret = devm_request_threaded_irq(&pdev->dev, data->irq, NULL, - hisi_thermal_alarm_irq_thread, - IRQF_ONESHOT, "hisi_thermal", data); - if (ret < 0) { - dev_err(&pdev->dev, "failed to request alarm irq: %d\n", ret); - return ret; + if (data->irq) { + ret = devm_request_threaded_irq(dev, data->irq, NULL, + hisi_thermal_alarm_irq_thread, + IRQF_ONESHOT, "hisi_thermal", data); + if (ret < 0) { + dev_err(dev, "failed to request alarm irq: %d\n", ret); + return ret; + } } hisi_thermal_toggle_sensor(&data->sensor, true); @@ -398,7 +439,8 @@ static int hisi_thermal_remove(struct platform_device *pdev) struct hisi_thermal_sensor *sensor = &data->sensor; hisi_thermal_toggle_sensor(sensor, false); - hi6220_thermal_disable_sensor(data); + + data->disable_sensor(data); return 0; } @@ -408,7 +450,7 @@ static int hisi_thermal_suspend(struct device *dev) { struct hisi_thermal_data *data = dev_get_drvdata(dev); - hi6220_thermal_disable_sensor(data); + data->disable_sensor(data); return 0; } @@ -417,7 +459,7 @@ static int hisi_thermal_resume(struct device *dev) { struct hisi_thermal_data *data = dev_get_drvdata(dev); - return hi6220_thermal_enable_sensor(data); + return data->enable_sensor(data); } #endif