From patchwork Sun Oct 22 08:54:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 116630 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp3456386qgn; Sun, 22 Oct 2017 01:57:16 -0700 (PDT) X-Received: by 10.101.81.70 with SMTP id g6mr8760816pgq.97.1508662636127; Sun, 22 Oct 2017 01:57:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508662636; cv=none; d=google.com; s=arc-20160816; b=OK1wsUcGtUPyOSveP9QQsV049PR63ZPytxkolkQ/DRsFefZ74C9LKfaWXZVEt8PqDK oNcRV7YAw0dm9MnsqNt7qVPN1ak+nscFGhucrcgt7WL63sq3+g9sbBAlJzQDtyUwNdYi b2L+F8mDL41VzVltE5kd3aGHsqCX73awwhS79rzr9nZq/tWl+0GFnNS96j/S5y3bbf62 6llj2qG+IzOOQhHtaDXqgoH299IMOMhbMl1tutsWUzLzrLZn5U4OJYMX+v+VTSHTklKp enSP98nQDCPbV+7sV4rjACciJd1MCqm8myXJOv3oixKVypzzOkwcXtVHQvhW7F5Dr/t8 hykQ== 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=CG1d15eWA/pWBmMfotHl7J+pz45T0TXosTIMP72F8Bg=; b=cBp611ZpFH3gbNsB0riX86jWSIYbeEhTluWqExnZMmQO30/mrWIo5LeC1ju5fYv0ha We/DnpQaDRksMcYhHHnDRpXXGTn25HotUgEImnVwLr89aqMEEpBiTsLSmeqHFhFLWKIC n4HofTl2X4lBOox9KmNMpQGmTQQWTayPN76gJU2/xWl2JM7zybgk+2eANADJyokoSaAU 8HNkaMHrvOxlU8X/OjuVvMOcgtsHdasdfMenF0ebyiRcv1hkmB2Sc6k6BTWfcVa8adhF VJ+VgtTvk6DhHNpD4etF771F/5PQpJm4VmCvYhBQJ2AjWLFpUFr92pfSPFEJXu4mzYPe WhcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UsuXjdu/; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 n74si3556217pfi.253.2017.10.22.01.57.15; Sun, 22 Oct 2017 01:57:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=UsuXjdu/; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 S1751614AbdJVI5O (ORCPT + 27 others); Sun, 22 Oct 2017 04:57:14 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:57065 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751466AbdJVI4u (ORCPT ); Sun, 22 Oct 2017 04:56:50 -0400 Received: by mail-wm0-f68.google.com with SMTP id l68so4579627wmd.5 for ; Sun, 22 Oct 2017 01:56:49 -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=CG1d15eWA/pWBmMfotHl7J+pz45T0TXosTIMP72F8Bg=; b=UsuXjdu/FHFAJnepr4O6uJ6Z3A7ZwtJdJyFkymSBv+TqGsw6iUmFcaEw/vd2DBdGfB y6bt3f3AbOW4oDEe7+YUPZwEJ7MpM85qB4pXgV4ZuBuQBb/Z/hxSOMfyy/Vkaxsad7uM K9g41eZJ2ElHERtTtHwUPq/twwaLAQ8PA5BDo= 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=CG1d15eWA/pWBmMfotHl7J+pz45T0TXosTIMP72F8Bg=; b=KBhSMYplFa6mcPIcw+xBD04jwPsSdw7AyQ0fWTpcXVcYTUzHO4afMdu7MIxXqv8Z5U m8RHcsHNkEOn0f33c4AY1y/nXe/fkRXTGffnp63Tc/SqLGNkHnROOQPiSKw7xAxaSVgG yXObvzY90HlDW8qLyWZWDCYKdwQifXeLncIciE6UmLTl2RE+QTPbKrCK+zQoXesrhVbT rV2HzWqqilNw+f2F5Z0VzwlJfFAdfmOTgGQYyhuvG3vzhBVhddec+MVWXPx7hrIBkk1P 7FU6cwulgVfLBQCuL56Ox3sPv9HOVtyy6FDT3aOJ0q2bt+Tk1BkC0X+E2H1HL/1UX46G hQfg== X-Gm-Message-State: AMCzsaUEIpafcRLvTeZotXGlLQM3r8fS4OXj0HGp1v7HiR9unMmTwYPS XALjLmcVi7/u9kn50zo6sznZvgUrzXE= X-Google-Smtp-Source: ABhQp+QBMXwkcHmg3UtYC2IxV7PYkIiO1ZR0h81ryyj26osWaUeqq3SXctGYkRkZ2eyaKV4ajNdTWA== X-Received: by 10.28.134.149 with SMTP id i143mr2620397wmd.79.1508662608573; Sun, 22 Oct 2017 01:56:48 -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.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 22 Oct 2017 01:56:48 -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 4/4] thermal/drivers/hisi: Add support for hi3660 SoC Date: Sun, 22 Oct 2017 10:54:35 +0200 Message-Id: <1508662475-6763-5-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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kevin Wangtao This patch adds the support for thermal sensor on the Hi3660 SoC. Hi3660 tsensor support alarm in alarm threshold, it also has a configurable hysteresis interval, interrupt will be triggered when temperature rise above the alarm threshold or fall below the hysteresis threshold. Signed-off-by: Kevin Wangtao Tested-by: Daniel Lezcano # hikey6220 Signed-off-by: Daniel Lezcano --- drivers/thermal/hisi_thermal.c | 145 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 144 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c index d74746d..6a4e866 100644 --- a/drivers/thermal/hisi_thermal.c +++ b/drivers/thermal/hisi_thermal.c @@ -39,12 +39,24 @@ #define HI6220_TEMP0_RST_MSK (0x1C) #define HI6220_TEMP0_VALUE (0x28) +#define HI3660_OFFSET(chan) ((chan) * 0x40) +#define HI3660_TEMP(chan) (HI3660_OFFSET(chan) + 0x1C) +#define HI3660_TH(chan) (HI3660_OFFSET(chan) + 0x20) +#define HI3660_LAG(chan) (HI3660_OFFSET(chan) + 0x28) +#define HI3660_INT_EN(chan) (HI3660_OFFSET(chan) + 0x2C) +#define HI3660_INT_CLR(chan) (HI3660_OFFSET(chan) + 0x30) + #define HI6220_TEMP_BASE (-60000) #define HI6220_TEMP_RESET (100000) #define HI6220_TEMP_STEP (785) #define HI6220_TEMP_LAG (3500) +#define HI3660_TEMP_BASE (-63780) +#define HI3660_TEMP_STEP (205) +#define HI3660_TEMP_LAG (4000) + #define HI6220_DEFAULT_SENSOR 2 +#define HI3660_DEFAULT_SENSOR 1 struct hisi_thermal_sensor { struct thermal_zone_device *tzd; @@ -93,6 +105,24 @@ static inline int hi6220_thermal_temp_to_step(int temp) } /* + * for Hi3660, + * Step: 189/922 (0.205) + * Temperature base: -63.780°C + * + * The register is programmed in temperature steps, every step is 205 + * millidegree and begins at -63 780 m°C + */ +static inline int hi3660_thermal_step_to_temp(int step) +{ + return HI3660_TEMP_BASE + step * HI3660_TEMP_STEP; +} + +static inline int hi3660_thermal_temp_to_step(int temp) +{ + return DIV_ROUND_UP(temp - HI3660_TEMP_BASE, HI3660_TEMP_STEP); +} + +/* * The lag register contains 5 bits encoding the temperature in steps. * * Each time the temperature crosses the threshold boundary, an @@ -166,6 +196,45 @@ static inline int hi6220_thermal_get_temperature(void __iomem *addr) } /* + * [0:6] lag register + * + * The temperature is coded in steps, cf. HI3660_TEMP_STEP. + * + * Min : 0x00 : 0.0 °C + * Max : 0x7F : 26.0 °C + * + */ +static inline void hi3660_thermal_set_lag(void __iomem *addr, + int id, int value) +{ + writel(DIV_ROUND_UP(value, HI3660_TEMP_STEP) & 0x7F, + addr + HI3660_LAG(id)); +} + +static inline void hi3660_thermal_alarm_clear(void __iomem *addr, + int id, int value) +{ + writel(value, addr + HI3660_INT_CLR(id)); +} + +static inline void hi3660_thermal_alarm_enable(void __iomem *addr, + int id, int value) +{ + writel(value, addr + HI3660_INT_EN(id)); +} + +static inline void hi3660_thermal_alarm_set(void __iomem *addr, + int id, int value) +{ + writel(value, addr + HI3660_TH(id)); +} + +static inline int hi3660_thermal_get_temperature(void __iomem *addr, int id) +{ + return hi3660_thermal_step_to_temp(readl(addr + HI3660_TEMP(id))); +} + +/* * Temperature configuration register - Sensor selection * * Bits [19:12] @@ -203,11 +272,22 @@ static int hi6220_thermal_irq_handler(struct hisi_thermal_data *data) return 0; } +static int hi3660_thermal_irq_handler(struct hisi_thermal_data *data) +{ + hi3660_thermal_alarm_clear(data->regs, data->sensor.id, 1); + return 0; +} + static int hi6220_thermal_get_temp(struct hisi_thermal_data *data) { return hi6220_thermal_get_temperature(data->regs); } +static int hi3660_thermal_get_temp(struct hisi_thermal_data *data) +{ + return hi3660_thermal_get_temperature(data->regs, data->sensor.id); +} + static int hi6220_thermal_disable_sensor(struct hisi_thermal_data *data) { /* disable sensor module */ @@ -220,6 +300,13 @@ static int hi6220_thermal_disable_sensor(struct hisi_thermal_data *data) return 0; } +static int hi3660_thermal_disable_sensor(struct hisi_thermal_data *data) +{ + /* disable sensor module */ + hi3660_thermal_alarm_enable(data->regs, data->sensor.id, 0); + return 0; +} + static int hi6220_thermal_enable_sensor(struct hisi_thermal_data *data) { struct hisi_thermal_sensor *sensor = &data->sensor; @@ -258,6 +345,28 @@ static int hi6220_thermal_enable_sensor(struct hisi_thermal_data *data) return 0; } +static int hi3660_thermal_enable_sensor(struct hisi_thermal_data *data) +{ + unsigned int value; + struct hisi_thermal_sensor *sensor = &data->sensor; + + /* disable interrupt */ + hi3660_thermal_alarm_enable(data->regs, sensor->id, 0); + + /* setting lag value between current temp and the threshold */ + hi3660_thermal_set_lag(data->regs, sensor->id, HI3660_TEMP_LAG); + + /* set interrupt threshold */ + value = hi3660_thermal_temp_to_step(sensor->thres_temp); + hi3660_thermal_alarm_set(data->regs, sensor->id, value); + + /* enable interrupt */ + hi3660_thermal_alarm_clear(data->regs, sensor->id, 1); + hi3660_thermal_alarm_enable(data->regs, sensor->id, 1); + + return 0; +} + static int hi6220_thermal_probe(struct hisi_thermal_data *data) { struct platform_device *pdev = data->pdev; @@ -294,6 +403,33 @@ static int hi6220_thermal_probe(struct hisi_thermal_data *data) return 0; } +static int hi3660_thermal_probe(struct hisi_thermal_data *data) +{ + struct platform_device *pdev = data->pdev; + struct device *dev = &pdev->dev; + struct resource *res; + + data->get_temp = hi3660_thermal_get_temp; + data->enable_sensor = hi3660_thermal_enable_sensor; + data->disable_sensor = hi3660_thermal_disable_sensor; + data->irq_handler = hi3660_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->irq = platform_get_irq(pdev, 0); + if (data->irq < 0) + return data->irq; + + data->sensor.id = HI3660_DEFAULT_SENSOR; + + return 0; +} + static int hisi_thermal_get_temp(void *__data, int *temp) { struct hisi_thermal_data *data = __data; @@ -367,7 +503,14 @@ static int hisi_thermal_register_sensor(struct platform_device *pdev, } static const struct of_device_id of_hisi_thermal_match[] = { - { .compatible = "hisilicon,tsensor", .data = hi6220_thermal_probe }, + { + .compatible = "hisilicon,tsensor", + .data = hi6220_thermal_probe + }, + { + .compatible = "hisilicon,hi3660-tsensor", + .data = hi3660_thermal_probe + }, { /* end */ } }; MODULE_DEVICE_TABLE(of, of_hisi_thermal_match);