From patchwork Tue Oct 10 18:02:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 115432 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp4040004qgn; Tue, 10 Oct 2017 11:06:04 -0700 (PDT) X-Received: by 10.99.97.149 with SMTP id v143mr13382649pgb.413.1507658764328; Tue, 10 Oct 2017 11:06:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507658764; cv=none; d=google.com; s=arc-20160816; b=R3OgweEOOFE0YsxvQqLoY2nyXjIXnjuHx/qTuHPi1tC7WH7LMLX7ihO3bXjgzo11O8 6JqJDcYcpSNRZ5bR6NdJpDpTEXlt5PVS4iQaiYFyrkk184uQ4v6MvW/14Wj40uQF861/ zBKo4l5K176Q1EL58oUpBZyoTGZAKYFEXXjLoQLauMFxwLlh8dUGnHYNMfXip8tbh6wS LcXHEFZKKMBUzXzMainGSYsUWEj4DdwYkRcnps8h5WJeGwfuNFjTIXbZ/gMXFPZvbWfx 2SCsTLdubCPZtYthTzHBG9FUqdioOeWc03TRgcjcimm7f/Yx9GRI62W2/PWOGu5ZI9Ui Fw5g== 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=J4tgdYdChDOIE8BSH2Zh0Ln13OVM2CbDsw5g9aVP6rA=; b=oq02P8vMgSZZ3PkXqftgX9t1Lu/F1U4mdmZYchHFy15k4EKo3R7rf3wpcag5nEPVsj MGDHns7i0+K+BWJLOjx3+TuOr6OiwHCwQh1qcss3pSvesbw1vCInt4X72/BgpAyK1kOs ByHuHQAeHHcU7j4q70F+EhVjHlwk8YLPz2BrS84R0hZBviiNeiC7EvX1wR+YySeQen4Y Q7nCHIm0ch55+Xmi+s4UNRKQYbqQBeKCyy/a+93VvVD6rmXEBrHF6XoxhlLXMwmEoq05 sphbbiLQy/pVSf5orA2oXmqnUsBDHV0vzPrJ2W1wy8x7q4Jw+wjrSoqtbFyoJhuZxOqy gF6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QDDNTsSZ; 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 m1si1401557pgq.230.2017.10.10.11.06.04; Tue, 10 Oct 2017 11:06:04 -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=QDDNTsSZ; 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 S1756528AbdJJSGB (ORCPT + 26 others); Tue, 10 Oct 2017 14:06:01 -0400 Received: from mail-wm0-f54.google.com ([74.125.82.54]:50853 "EHLO mail-wm0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932702AbdJJSF0 (ORCPT ); Tue, 10 Oct 2017 14:05:26 -0400 Received: by mail-wm0-f54.google.com with SMTP id u138so7495007wmu.5 for ; Tue, 10 Oct 2017 11:05:25 -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=J4tgdYdChDOIE8BSH2Zh0Ln13OVM2CbDsw5g9aVP6rA=; b=QDDNTsSZCjoLTgosAZswMcPwzC6BlCTOZOUwFL9FGyMotsXr3RLfQdC13wHqmcjuK+ Ssfk1yt3Gt4QIQZIhHMTITqtBLeXJ6whU2Prw8UoKXM4w03jyQhl/vbsPll+4E4c+/Tu 6OHdE/JNCQ58DnxQZ2r3TBJZiF2CR4DL1CQKM= 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=J4tgdYdChDOIE8BSH2Zh0Ln13OVM2CbDsw5g9aVP6rA=; b=Q+VPULWgnQx0CziPMzBaYcsr33BuOpMlIOdAeiCbVyywcvDbq/SYvny4x4aNTVXaWH jOgLBK/YMuv0XzB9uJa67LZU5v1P5WdCb5R6J5PKAN9WP4LRnmtxhaEhZp2eI385DKoL 2+i3waVLLJ2f5ZylWcLw7hNRhs31egbez7Tw0TpuozcmzI53ZUzJ8Tqj5XTeuvqNyJbw 1gOZXE+b6ktQ3JRjNuqEFRiVXxTaa/B9JRo7EVjlHUAOGGPoFKY7K6eb6FEalzkyVO8v cPMI/Kq09s2ir4UNEfcGZBYWxD+WIWqLBl6hsw4NMg2IfbkzgnSlvRkdW2YBTPJr9RVO WqAg== X-Gm-Message-State: AMCzsaVVlKwGftBc7w6NC9copZdyBdceZDw53bzk//isJfBX7977sh4+ DXAnPX2/l+OU4Y3Ogvg6jGISBg== X-Google-Smtp-Source: AOwi7QD7B8LmUlbRK7uf+LvTbXq+bnUXGibf6XnsB+BeihMYKhOMK205DG7brkDhu8XMN2VsbYLOJw== X-Received: by 10.28.52.5 with SMTP id b5mr13036338wma.135.1507658724905; Tue, 10 Oct 2017 11:05:24 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:879a:6cd0:4f9:3ae1:43d2:31ae]) by smtp.gmail.com with ESMTPSA id l73sm12513428wmd.47.2017.10.10.11.05.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 Oct 2017 11:05:24 -0700 (PDT) From: Daniel Lezcano To: edubezval@gmail.com, rui.zhang@intel.com Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, kevin.wangtao@linaro.org Subject: [PATCH 24/25] thermal/drivers/hisi: Add support for hi3660 SoC Date: Tue, 10 Oct 2017 20:02:49 +0200 Message-Id: <1507658570-32675-24-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1507658570-32675-1-git-send-email-daniel.lezcano@linaro.org> References: <79a5f10c-0fb7-3e4f-caac-c1625904b137@linaro.org> <1507658570-32675-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 interrupt and have three configurable alarm thresholds, 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 Signed-off-by: Daniel Lezcano --- drivers/thermal/hisi_thermal.c | 146 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 145 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c index e87ca6c..10276f0 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 #define MAX_THRES_NUM 2 @@ -96,6 +108,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 @@ -169,6 +199,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] @@ -206,11 +275,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 */ @@ -222,6 +302,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; @@ -260,6 +347,29 @@ 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[0]); + value |= hi3660_thermal_temp_to_step(sensor->thres_temp[1]) << 10; + 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; @@ -296,6 +406,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) { @@ -371,7 +508,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);