From patchwork Fri Oct 20 15:11:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 116511 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp1800219qgn; Fri, 20 Oct 2017 08:13:37 -0700 (PDT) X-Received: by 10.99.175.26 with SMTP id w26mr4908802pge.11.1508512417531; Fri, 20 Oct 2017 08:13:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508512417; cv=none; d=google.com; s=arc-20160816; b=fc1teAAmVivsv0BjzC3CX9qx8QQPicEonAieehPbVRBVYhUWPra1KLDxcGRdyBHnjQ OyhVl5DXkRn47xKgZo/WeGUwASULZ9LvoFNiy4oSO2QHn2b+1AdnuRlZKYnh+QGznF9q 3ckROkDpP0ANL8v7VlBdjWCIUX5Olik9lJZLdV1F5D3O/uMEz5TjgwEcW+KoNem8Io93 37RYfeCpGNhYFhtt/Epl83AUQi4wd+IbKQS/KR/4Qjq3lWcyDjn52v0KY3500pGxCwsU XawDrfJt6SqgAG7WA96Y8UfKh9rVia3Wp8Wms8UIx+oTEMl5LUUXCRG3M+9ikSPyYCV+ yHHQ== 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=wuLxvbHqBUUZV/pSoMoJFv4kf4Lpxou2fWGC9lBCoRQ=; b=Lbcb0yDbEkoBTOaH1ihTs3YhAsvijsW2WLurgqn1gYkQ2LQH5jluuXC9cz9ID/wcMN /HuY4ZNUnupL+ZjhYn8VPUwA6QG7dLufEkQzP3BnxOU9ODnx2ewfkJvLRT3acFDZaV0y nTKOmtiHqQa8h6Rs9ulUhtUkbutH0lyo09Xi7sVb1NaGHBPLsioTVurfcuo6/hPQOt9q Y+qw6m0fVcNuKj02mIL+oF5/qIRf9Z/r2WA/D8ay2mlXxBK77fLXNI4E6cT8iFQIWaTl xe5zVH6Em+jra1MAlUiQNHpKDDdVXVlOVVZAb+wJkg/ucP8pXE7PpfdHRjLTXKeGsS+5 oy1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fX/3cNyF; 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 k91si704198pld.242.2017.10.20.08.13.37; Fri, 20 Oct 2017 08:13:37 -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=fX/3cNyF; 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 S1752501AbdJTPNg (ORCPT + 27 others); Fri, 20 Oct 2017 11:13:36 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:53189 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752266AbdJTPNU (ORCPT ); Fri, 20 Oct 2017 11:13:20 -0400 Received: by mail-wr0-f196.google.com with SMTP id k62so11628937wrc.9 for ; Fri, 20 Oct 2017 08:13:19 -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=wuLxvbHqBUUZV/pSoMoJFv4kf4Lpxou2fWGC9lBCoRQ=; b=fX/3cNyFPz7tKq1cs+ElGwWYI+tIjWlN1qsRpSvt1q93LFWt3EWLeCttr3NMhZKu2H Nv0VacQSYLOBiCM1G/lKptW96ukl6Aa1d5Kw6KZH4/GclaPDrK8BYe3uFe9yVAWZCfS0 /A+MoJuT8aRimdepF+E1Mqncjh4RgS+eGTu/0= 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=wuLxvbHqBUUZV/pSoMoJFv4kf4Lpxou2fWGC9lBCoRQ=; b=RiAgRXJ/UIvxd1ixjyqkJBDcPl2p9egsX12yJ7SPT+bBfVkYnRImDEUPpJtvxgYjGq N2bpVe3SdJE9qLbIKB2UU72RuRGFrLIJjI+Psb2zYWGc7viLKsJrNcimNA+xXzdP4qaN 1iQvkDhfW5cKUpcUmIV8InFbF28U+yaZwtnNYaGsrC/khKDG8V5wtmLgfGWjOh0MnNtW /0UVVpvZQVcig5MYf3zNC3DxgKxtrNg38SuXOs+Byjc73pSVTre4SgbXLNEkdhNw3+dv KknFPfhcbv0KHg6k5JrYD5Owx1IZ6lQGJXT68KgxRgZMFoveFC6B2MDOn0OTCOEfc8VV JVVg== X-Gm-Message-State: AMCzsaU8zb8jGkp2ZE5LNRYakv15uUXkf2vLg+wqhwzLtMbMhCWFjVQc 7vQSZXmiHuF8YREtOmfmF3/0eA== X-Google-Smtp-Source: ABhQp+R/6EMsm3jwFmfVzr8fapNWLPTwpDqgfAtyIMX18YY5Z/sGWCDTFWz672kg40I1J0Z0mlIFHA== X-Received: by 10.223.173.175 with SMTP id w44mr1538191wrc.19.1508512398700; Fri, 20 Oct 2017 08:13:18 -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.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Oct 2017 08:13:18 -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 4/4] thermal/drivers/hisi: Add support for hi3660 SoC Date: Fri, 20 Oct 2017 17:11:07 +0200 Message-Id: <1508512267-18302-5-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-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 98a4403..94186e7 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);