From patchwork Thu Feb 2 15:08:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoyou Xie X-Patchwork-Id: 93111 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp143115qgi; Thu, 2 Feb 2017 07:09:40 -0800 (PST) X-Received: by 10.98.153.155 with SMTP id t27mr11209195pfk.48.1486048180016; Thu, 02 Feb 2017 07:09:40 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h91si22557453pld.68.2017.02.02.07.09.39; Thu, 02 Feb 2017 07:09:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751752AbdBBPJj (ORCPT + 7 others); Thu, 2 Feb 2017 10:09:39 -0500 Received: from mail-pg0-f46.google.com ([74.125.83.46]:33995 "EHLO mail-pg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751640AbdBBPJh (ORCPT ); Thu, 2 Feb 2017 10:09:37 -0500 Received: by mail-pg0-f46.google.com with SMTP id 14so6485119pgg.1 for ; Thu, 02 Feb 2017 07:09:37 -0800 (PST) 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=/XA5fFRzhjE03eNmqzhVndCQ91zYLqBygdJ4rvHDly4=; b=U1YFCL/QT5uiaLRPMVnbcXTBwycW0SL0l8xf1YTBDE0q9F02sH864Js5HBZEKziT0p 0Nftt0YQibi0L7XehRWxJoQVJ/TqMFYgDfN0NkVHEpHzBz0Q6NiPn7Y/FMCRcAIqsh3U 0zEnjBBWZIYRzQxXyZKvIcO7RtUDeHTAuxWDk= 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=/XA5fFRzhjE03eNmqzhVndCQ91zYLqBygdJ4rvHDly4=; b=DB4rLMkU5PXhx7Jlne8lBmEUouaLktIcMEEbcool04hGUpY4n4viuuLXvDs7a2AanI n6n/syZ7WsrDdNywtsKYUWvJfZdBmviUHNchIscfI59MCNbQ7eS6w4d/PfaNXjMLh56N k26E0WJ0i7YC4YyREG/zV9PmaxIghtwG1jLcMexgHNP//SxbmfZ3wBEu56YqhWCFKd9+ Mgbn/RVBiTZE2ZPvCb56gSY+v5093YMF+yEXgLc5/hwSbOmqkkgS2KOBlXn5j6hMm/u6 Elxz6wfi1M91EaKU3IJMmQJ8Sehd04v8lkAZ1ICqiPVbG/ytFV+itpWvp/ElszNs8hsb UXOA== X-Gm-Message-State: AIkVDXLttILIZ0vZqzr6MioJRKVPr4EHh79FPRjW1z7WdGsu875PkHvbuxKaBby2HK9DF6Y8 X-Received: by 10.99.130.193 with SMTP id w184mr11235781pgd.194.1486048177232; Thu, 02 Feb 2017 07:09:37 -0800 (PST) Received: from localhost.localdomain ([45.56.152.28]) by smtp.gmail.com with ESMTPSA id y6sm59878236pgc.1.2017.02.02.07.09.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 02 Feb 2017 07:09:36 -0800 (PST) From: Baoyou Xie To: jun.nie@linaro.org, rui.zhang@intel.com, edubezval@gmail.com, robh+dt@kernel.org, mark.rutland@arm.com Cc: linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, shawnguo@kernel.org, baoyou.xie@linaro.org, xie.baoyou@zte.com.cn, chen.chaokai@zte.com.cn, wang.qiang01@zte.com.cn Subject: [PATCH v6 2/3] MAINTAINERS: add zx2967 thermal drivers to ARM ZTE architecture Date: Thu, 2 Feb 2017 23:08:05 +0800 Message-Id: <1486048086-3431-2-git-send-email-baoyou.xie@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1486048086-3431-1-git-send-email-baoyou.xie@linaro.org> References: <1486048086-3431-1-git-send-email-baoyou.xie@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add the zx2967 thermal drivers as maintained by ARM ZTE architecture maintainers, as they're parts of the core IP. Signed-off-by: Baoyou Xie --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/MAINTAINERS b/MAINTAINERS index 5fb9b62..edfdea3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1989,10 +1989,12 @@ F: arch/arm/mach-zx/ F: drivers/clk/zte/ F: drivers/reset/reset-zx2967.c F: drivers/soc/zte/ +F: drivers/thermal/zx* F: Documentation/devicetree/bindings/arm/zte.txt F: Documentation/devicetree/bindings/clock/zx296702-clk.txt F: Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt F: Documentation/devicetree/bindings/soc/zte/ +F: Documentation/devicetree/bindings/thermal/zx* F: include/dt-bindings/soc/zx*.h ARM/ZYNQ ARCHITECTURE From patchwork Thu Feb 2 15:08:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoyou Xie X-Patchwork-Id: 93112 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp140558obz; Thu, 2 Feb 2017 07:10:38 -0800 (PST) X-Received: by 10.84.173.168 with SMTP id p37mr13297346plb.30.1486048238059; Thu, 02 Feb 2017 07:10:38 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g12si22534483pla.248.2017.02.02.07.10.37; Thu, 02 Feb 2017 07:10:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751668AbdBBPKg (ORCPT + 7 others); Thu, 2 Feb 2017 10:10:36 -0500 Received: from mail-pf0-f170.google.com ([209.85.192.170]:35124 "EHLO mail-pf0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751596AbdBBPKe (ORCPT ); Thu, 2 Feb 2017 10:10:34 -0500 Received: by mail-pf0-f170.google.com with SMTP id f144so5946012pfa.2 for ; Thu, 02 Feb 2017 07:10:34 -0800 (PST) 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=Fnc9chJEdWd3hkhFc/SGDs/7HpCgT/7kuHBv7bU+tdE=; b=WnTsjiW9/FHjyUYoBcptHLnoSE+JdEtT+V2XnQgJbLwQ0MIoz4quefqqPWmfhKhNh6 aRMXM+WLoqaYzYlDIDjXFQZN+CdQcfHCB1+rnVwG0JFW0qFD3KY3PPPRdWS16yYnghOa hBAIfCsiTaJyvAt/AzwRoeJrMSMZbIoMvLXcQ= 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=Fnc9chJEdWd3hkhFc/SGDs/7HpCgT/7kuHBv7bU+tdE=; b=gJorimFDWLTeaZbC9jAZsTmzuEsEeJMV5vE0koyUy++ASav6jIHxdUewgegwOoenmW ICFaENfBXLm8Lcfw76QzQuDksyhXjtCHkG4sphtgAztX84d8JctAv6YU1iHHXYeatEDd ZpvNpfgLUILBpuZTvb9VKMEhQg1gogLDxyN7xqq/gpU5NNGFWkE/5ZeWwrie/jrUdHsj 06JSk2boViRFPlJObuzRr+PHJEn6HUkgAu3vf2B9TvJLdH9UAneehbV9YhNbECauPN+M 6/VPCyBRo1EX2BGbx10DgrWB8YODFaNPkKU36D184jLQQRH1osgxP8Dv6f53RySWt5nF 1Vyg== X-Gm-Message-State: AIkVDXIS8lV33nZoiHpwPXfsBnTgAxVAo/fs4+JHel1fyLiG0d8MbqH7erJ40sOZ3xMR7kjE X-Received: by 10.84.216.24 with SMTP id m24mr13288374pli.22.1486048234024; Thu, 02 Feb 2017 07:10:34 -0800 (PST) Received: from localhost.localdomain ([45.56.152.28]) by smtp.gmail.com with ESMTPSA id y6sm59878236pgc.1.2017.02.02.07.09.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 02 Feb 2017 07:10:33 -0800 (PST) From: Baoyou Xie To: jun.nie@linaro.org, rui.zhang@intel.com, edubezval@gmail.com, robh+dt@kernel.org, mark.rutland@arm.com Cc: linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, shawnguo@kernel.org, baoyou.xie@linaro.org, xie.baoyou@zte.com.cn, chen.chaokai@zte.com.cn, wang.qiang01@zte.com.cn Subject: [PATCH v6 3/3] thermal: zx2967: add thermal driver for ZTE's zx2967 family Date: Thu, 2 Feb 2017 23:08:06 +0800 Message-Id: <1486048086-3431-3-git-send-email-baoyou.xie@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1486048086-3431-1-git-send-email-baoyou.xie@linaro.org> References: <1486048086-3431-1-git-send-email-baoyou.xie@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This patch adds thermal driver for ZTE's zx2967 family. Signed-off-by: Baoyou Xie --- drivers/thermal/Kconfig | 8 ++ drivers/thermal/Makefile | 1 + drivers/thermal/zx2967_thermal.c | 265 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 274 insertions(+) create mode 100644 drivers/thermal/zx2967_thermal.c -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index 18f2de6..f64bd50 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -444,4 +444,12 @@ config BCM2835_THERMAL help Support for thermal sensors on Broadcom bcm2835 SoCs. +config ZX2967_THERMAL + tristate "Thermal sensors on zx2967 SoC" + depends on ARCH_ZX || COMPILE_TEST + help + Enable the zx2967 thermal sensors driver, which supports + the primitive temperature sensor embedded in zx2967 SoCs. + This sensor generates the real time die temperature. + endif diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile index 677c6d9..c00c05e 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile @@ -57,3 +57,4 @@ obj-$(CONFIG_HISI_THERMAL) += hisi_thermal.o obj-$(CONFIG_MTK_THERMAL) += mtk_thermal.o obj-$(CONFIG_GENERIC_ADC_THERMAL) += thermal-generic-adc.o obj-$(CONFIG_BCM2835_THERMAL) += bcm2835_thermal.o +obj-$(CONFIG_ZX2967_THERMAL) += zx2967_thermal.o diff --git a/drivers/thermal/zx2967_thermal.c b/drivers/thermal/zx2967_thermal.c new file mode 100644 index 0000000..d8642cf --- /dev/null +++ b/drivers/thermal/zx2967_thermal.c @@ -0,0 +1,265 @@ +/* + * ZTE's zx2967 family thermal sensor driver + * + * Copyright (C) 2017 ZTE Ltd. + * + * Author: Baoyou Xie + * + * License terms: GNU General Public License (GPL) version 2 + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +/* Power Mode: 0->low 1->high */ +#define ZX2967_THERMAL_POWER_MODE 0 + +/* DCF Control Register */ +#define ZX2967_THERMAL_DCF 0x4 + +/* Selection Register */ +#define ZX2967_THERMAL_SEL 0x8 + +/* Control Register */ +#define ZX2967_THERMAL_CTRL 0x10 + +#define ZX2967_THERMAL_READY 0x1000 +#define ZX2967_THERMAL_TEMP_MASK 0xfff +#define ZX2967_THERMAL_ID_MASK 0x18 +#define ZX2967_THERMAL_ID0 0x8 +#define ZX2967_THERMAL_ID1 0x10 + +struct zx2967_thermal_sensor { + struct zx2967_thermal_priv *priv; + struct thermal_zone_device *tzd; + int id; +}; + +#define NUM_SENSORS 1 + +struct zx2967_thermal_priv { + struct zx2967_thermal_sensor sensors[NUM_SENSORS]; + /* Prevents reads sensor in parallel */ + struct mutex lock; + struct clk *clk_gate; + struct clk *pclk; + s32 slope; + s32 offset; + void __iomem *regs; + struct device *dev; +}; + +static int zx2967_thermal_suspend(struct device *dev) +{ + struct platform_device *pdev = to_platform_device(dev); + struct zx2967_thermal_priv *priv = platform_get_drvdata(pdev); + + if (priv && priv->pclk) + clk_disable_unprepare(priv->pclk); + + if (priv && priv->clk_gate) + clk_disable_unprepare(priv->clk_gate); + + return 0; +} + +static int zx2967_thermal_resume(struct device *dev) +{ + struct platform_device *pdev = to_platform_device(dev); + struct zx2967_thermal_priv *priv = platform_get_drvdata(pdev); + int error; + + error = clk_prepare_enable(priv->clk_gate); + if (error) + return error; + + error = clk_prepare_enable(priv->pclk); + if (error) { + clk_disable_unprepare(priv->clk_gate); + return error; + } + + return 0; +} + +static int zx2967_thermal_get_temp(void *data, int *temp) +{ + void __iomem *regs; + struct zx2967_thermal_sensor *sensor = data; + struct zx2967_thermal_priv *priv = sensor->priv; + unsigned long timeout = jiffies + msecs_to_jiffies(100); + u32 val, sel_id; + + regs = priv->regs; + mutex_lock(&priv->lock); + + writel_relaxed(0, regs + ZX2967_THERMAL_POWER_MODE); + writel_relaxed(2, regs + ZX2967_THERMAL_DCF); + + val = readl_relaxed(regs + ZX2967_THERMAL_SEL); + val &= ~ZX2967_THERMAL_ID_MASK; + sel_id = sensor->id ? ZX2967_THERMAL_ID0 : ZX2967_THERMAL_ID1; + val |= sel_id; + writel_relaxed(val, regs + ZX2967_THERMAL_SEL); + + usleep_range(100, 300); + val = readl_relaxed(regs + ZX2967_THERMAL_CTRL); + while (!(val & ZX2967_THERMAL_READY)) { + if (time_after(jiffies, timeout)) { + dev_err(priv->dev, "Thermal sensor %d data timeout\n", + sensor->id); + mutex_unlock(&priv->lock); + return -ETIMEDOUT; + } + usleep_range(100, 300); + val = readl_relaxed(regs + ZX2967_THERMAL_CTRL); + } + + writel_relaxed(3, regs + ZX2967_THERMAL_DCF); + val = readl_relaxed(regs + ZX2967_THERMAL_CTRL) + & ZX2967_THERMAL_TEMP_MASK; + writel_relaxed(1, regs + ZX2967_THERMAL_POWER_MODE); + + /* Calculate temperature */ + *temp = DIV_ROUND_CLOSEST(((s32)val + priv->offset) * 1000, + priv->slope); + + mutex_unlock(&priv->lock); + + return 0; +} + +static struct thermal_zone_of_device_ops zx2967_of_thermal_ops = { + .get_temp = zx2967_thermal_get_temp, +}; + +static int zx2967_thermal_probe(struct platform_device *pdev) +{ + struct zx2967_thermal_priv *priv; + struct resource *res; + u32 buf[2]; + int ret, i; + + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + priv->regs = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(priv->regs)) + return PTR_ERR(priv->regs); + + ret = of_property_read_u32_array(pdev->dev.of_node, + "coefficients", buf, 2); + if (ret) { + dev_err(&pdev->dev, "failed to read coefficients\n"); + return ret; + } + priv->slope = (s32)buf[0]; + priv->offset = (s32)buf[1]; + + priv->clk_gate = devm_clk_get(&pdev->dev, "gate"); + if (IS_ERR(priv->clk_gate)) { + ret = PTR_ERR(priv->clk_gate); + dev_err(&pdev->dev, "failed to get clock gate: %d\n", ret); + return ret; + } + + ret = clk_prepare_enable(priv->clk_gate); + if (ret) { + dev_err(&pdev->dev, "failed to enable converter clock: %d\n", + ret); + return ret; + } + + priv->pclk = devm_clk_get(&pdev->dev, "pclk"); + if (IS_ERR(priv->pclk)) { + ret = PTR_ERR(priv->pclk); + clk_disable_unprepare(priv->clk_gate); + dev_err(&pdev->dev, "failed to get apb clock: %d\n", ret); + return ret; + } + + ret = clk_prepare_enable(priv->pclk); + if (ret) { + clk_disable_unprepare(priv->clk_gate); + dev_err(&pdev->dev, "failed to enable converter clock: %d\n", + ret); + return ret; + } + + mutex_init(&priv->lock); + for (i = 0; i < NUM_SENSORS; i++) { + struct zx2967_thermal_sensor *sensor = &priv->sensors[i]; + + sensor->priv = priv; + sensor->id = i; + sensor->tzd = thermal_zone_of_sensor_register(&pdev->dev, + i, sensor, &zx2967_of_thermal_ops); + if (IS_ERR(sensor->tzd)) { + ret = PTR_ERR(sensor->tzd); + dev_err(&pdev->dev, "failed to register sensor %d: %d\n", + i, ret); + goto remove_ts; + } + } + priv->dev = &pdev->dev; + platform_set_drvdata(pdev, priv); + + return 0; + +remove_ts: + clk_disable_unprepare(priv->clk_gate); + clk_disable_unprepare(priv->pclk); + for (i--; i >= 0; i--) + thermal_zone_of_sensor_unregister(&pdev->dev, + priv->sensors[i].tzd); + + return ret; +} + +static int zx2967_thermal_exit(struct platform_device *pdev) +{ + struct zx2967_thermal_priv *priv = platform_get_drvdata(pdev); + int i; + + for (i = 0; i < NUM_SENSORS; i++) { + struct zx2967_thermal_sensor *sensor = &priv->sensors[i]; + + thermal_zone_of_sensor_unregister(&pdev->dev, sensor->tzd); + } + clk_disable_unprepare(priv->pclk); + clk_disable_unprepare(priv->clk_gate); + + return 0; +} + +static const struct of_device_id zx2967_thermal_id_table[] = { + { .compatible = "zte,zx296718-thermal" }, + {} +}; +MODULE_DEVICE_TABLE(of, zx2967_thermal_id_table); + +static SIMPLE_DEV_PM_OPS(zx2967_thermal_pm_ops, + zx2967_thermal_suspend, zx2967_thermal_resume); + +static struct platform_driver zx2967_thermal_driver = { + .probe = zx2967_thermal_probe, + .remove = zx2967_thermal_exit, + .driver = { + .name = "zx2967_thermal", + .of_match_table = zx2967_thermal_id_table, + .pm = &zx2967_thermal_pm_ops, + }, +}; +module_platform_driver(zx2967_thermal_driver); + +MODULE_AUTHOR("Baoyou Xie "); +MODULE_DESCRIPTION("ZTE zx2967 thermal driver"); +MODULE_LICENSE("GPL v2");