From patchwork Wed Jan 20 16:24:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 367059 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp618911jam; Wed, 20 Jan 2021 08:26:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJxh0XySb5Bo5KmGromTd++bcb//RIspS8kr5UGFWDnetiR5dPeIF1M+VgxLAklz9Gllztfg X-Received: by 2002:a17:906:a113:: with SMTP id t19mr777961ejy.253.1611159980477; Wed, 20 Jan 2021 08:26:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611159980; cv=none; d=google.com; s=arc-20160816; b=s9wvkmIbyFCT0md38wAVc/INlMW5VIN2fX1uheOBQK2Xexjbm/8YeagGpqCQWdsYp+ ocsisxUuO63AlOMTCWCMQOR8uY+vcAxaDDJ1MOD5lnNdLRLEvy3AAiAWNAa+s26LKnic l2HvCqpb29gFqU6+fg9/0HG/PVbbD+k//DYMWIugrBmF/KTlO7TZ2IW1aOEFYbnGPM4j Aw5g+9NECiLszV6J525f4DWvTzjed+wO4dkXIBv3GlpzWyKYIq4hGnuNRP/MXxs7OZos Z3XbTaKYl2OeX/kr2QSbaJnHzL1Qo+GhCiLVt5jKlQn47G7o1aivVhKopyDt3TduHAqf gxaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=beiNw6B1aGNhrw2aCgyMBslfnw9AghvZw1mi43PLScE=; b=d6cQv5hTLXcKVUesA+voJz+RBdA2U5LieGU9My0YCyfhs7J9gClaEtrbyGxJUDTXMm 4JenXDgrV9Fyl465pHb1A0BJsRL3k/Vv4YJrRn5WjE9xFxAB/e/kFnuE+N9XQL+G+nnj flVmQCJJ4PoMhdzKRXOaRu895aKHefZcI7MEWCI4oqCGdNzx4MGSkX/3GekitAIpKCah mog7z8l6JgWoXWOT/p9sm0F/uwotXNgPwhMjhvSZF6ik2wYvQ5bKyz73qzAggPckt2pg RmNprHLlbaS7XSN8XH68YS1PT3bHh29DwPREDvOoy6QmLR8oje5rL9RTAEgS7Urmxu+t Tj9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hoo60nje; spf=pass (google.com: domain of linux-pm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x17si1042102edq.181.2021.01.20.08.26.20; Wed, 20 Jan 2021 08:26:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-pm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hoo60nje; spf=pass (google.com: domain of linux-pm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403908AbhATQZF (ORCPT + 7 others); Wed, 20 Jan 2021 11:25:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:44842 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732218AbhATQY5 (ORCPT ); Wed, 20 Jan 2021 11:24:57 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id BFFF6233EF; Wed, 20 Jan 2021 16:24:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1611159853; bh=xEs2bOSXbMSUhxxuSZjX48yiNs5+INFp7l/yAgKizkg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hoo60njeXd5jRcJzNCp3XIC7I2nZjgvtsMYZklV+m97puU1Ou5XxamkkmlJspbgDk ORMREdn0BNjzuU9eZWY/VFN97Mvv8vIsVPgjSl7Zz7fvdU5CB+/mZycdVS5Lk1rXr9 PdXK4D46/n5du67iQTNs9QoX/1NxW2qYCr/2f2HL8OKX8X/1RHHk9wxxBIa7tfMRmF H/k6/1+AeawgtgNdtZgDA4+DeA1DreGc1Be2FViNuEHcgkgp4nTNYEy1A2zUyKG90B 14JmNtMvFphvd+22Qwkq15vUifwMEqbEqPCw1wZc/T+F8BgK1ljLpcN1fMrwhUJ146 78HysrdKvfoWw== From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Zhang Rui , Daniel Lezcano , Amit Kucheria Cc: Arnd Bergmann , Jun Nie , Shawn Guo Subject: [PATCH 2/2] thermal: remove zx driver Date: Wed, 20 Jan 2021 17:24:00 +0100 Message-Id: <20210120162400.4115366-3-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210120162400.4115366-1-arnd@kernel.org> References: <20210120162400.4115366-1-arnd@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org From: Arnd Bergmann The zte zx platform is getting removed, so this driver is no longer needed. Cc: Jun Nie Cc: Shawn Guo Signed-off-by: Arnd Bergmann --- .../bindings/thermal/zx2967-thermal.txt | 116 -------- drivers/thermal/Kconfig | 8 - drivers/thermal/Makefile | 1 - drivers/thermal/zx2967_thermal.c | 256 ------------------ 4 files changed, 381 deletions(-) delete mode 100644 Documentation/devicetree/bindings/thermal/zx2967-thermal.txt delete mode 100644 drivers/thermal/zx2967_thermal.c -- 2.29.2 diff --git a/Documentation/devicetree/bindings/thermal/zx2967-thermal.txt b/Documentation/devicetree/bindings/thermal/zx2967-thermal.txt deleted file mode 100644 index 3dc1c6bf0478..000000000000 --- a/Documentation/devicetree/bindings/thermal/zx2967-thermal.txt +++ /dev/null @@ -1,116 +0,0 @@ -* ZTE zx2967 family Thermal - -Required Properties: -- compatible: should be one of the following. - * zte,zx296718-thermal -- reg: physical base address of the controller and length of memory mapped - region. -- clocks : Pairs of phandle and specifier referencing the controller's clocks. -- clock-names: "topcrm" for the topcrm clock. - "apb" for the apb clock. -- #thermal-sensor-cells: must be 0. - -Please note: slope coefficient defined in thermal-zones section need to be -multiplied by 1000. - -Example for tempsensor: - - tempsensor: tempsensor@148a000 { - compatible = "zte,zx296718-thermal"; - reg = <0x0148a000 0x20>; - clocks = <&topcrm TEMPSENSOR_GATE>, <&audiocrm AUDIO_TS_PCLK>; - clock-names = "topcrm", "apb"; - #thermal-sensor-cells = <0>; - }; - -Example for cooling device: - - cooling_dev: cooling_dev { - cluster0_cooling_dev: cluster0-cooling-dev { - #cooling-cells = <2>; - cpumask = <0xf>; - capacitance = <1500>; - }; - - cluster1_cooling_dev: cluster1-cooling-dev { - #cooling-cells = <2>; - cpumask = <0x30>; - capacitance = <2000>; - }; - }; - -Example for thermal zones: - - thermal-zones { - zx296718_thermal: zx296718_thermal { - polling-delay-passive = <500>; - polling-delay = <1000>; - sustainable-power = <6500>; - - thermal-sensors = <&tempsensor 0>; - /* - * slope need to be multiplied by 1000. - */ - coefficients = <1951 (-922)>; - - trips { - trip0: switch_on_temperature { - temperature = <90000>; - hysteresis = <2000>; - type = "passive"; - }; - - trip1: desired_temperature { - temperature = <100000>; - hysteresis = <2000>; - type = "passive"; - }; - - crit: critical_temperature { - temperature = <110000>; - hysteresis = <2000>; - type = "critical"; - }; - }; - - cooling-maps { - map0 { - trip = <&trip0>; - cooling-device = <&gpu 2 5>; - }; - - map1 { - trip = <&trip0>; - cooling-device = <&cluster0_cooling_dev 1 2>; - }; - - map2 { - trip = <&trip1>; - cooling-device = <&cluster0_cooling_dev 1 2>; - }; - - map3 { - trip = <&crit>; - cooling-device = <&cluster0_cooling_dev 1 2>; - }; - - map4 { - trip = <&trip0>; - cooling-device = <&cluster1_cooling_dev 1 2>; - contribution = <9000>; - }; - - map5 { - trip = <&trip1>; - cooling-device = <&cluster1_cooling_dev 1 2>; - contribution = <4096>; - }; - - map6 { - trip = <&crit>; - cooling-device = <&cluster1_cooling_dev 1 2>; - contribution = <4096>; - }; - }; - }; - }; diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index cf199574c096..d7f44deab5b1 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -467,14 +467,6 @@ depends on (ARCH_QCOM && OF) || COMPILE_TEST source "drivers/thermal/qcom/Kconfig" endmenu -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. - config UNIPHIER_THERMAL tristate "Socionext UniPhier thermal driver" depends on ARCH_UNIPHIER || COMPILE_TEST diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile index a44dda2d03bc..82fc3e616e54 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile @@ -56,7 +56,6 @@ obj-y += tegra/ 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_ZX2967_THERMAL) += zx2967_thermal.o obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o obj-$(CONFIG_AMLOGIC_THERMAL) += amlogic_thermal.o obj-$(CONFIG_SPRD_THERMAL) += sprd_thermal.o diff --git a/drivers/thermal/zx2967_thermal.c b/drivers/thermal/zx2967_thermal.c deleted file mode 100644 index 8e3a2d3c2f9a..000000000000 --- a/drivers/thermal/zx2967_thermal.c +++ /dev/null @@ -1,256 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * ZTE's zx2967 family thermal sensor driver - * - * Copyright (C) 2017 ZTE Ltd. - * - * Author: Baoyou Xie - */ - -#include -#include -#include -#include -#include -#include -#include - -/* Power Mode: 0->low 1->high */ -#define ZX2967_THERMAL_POWER_MODE 0 -#define ZX2967_POWER_MODE_LOW 0 -#define ZX2967_POWER_MODE_HIGH 1 - -/* DCF Control Register */ -#define ZX2967_THERMAL_DCF 0x4 -#define ZX2967_DCF_EN BIT(1) -#define ZX2967_DCF_FREEZE BIT(0) - -/* Selection Register */ -#define ZX2967_THERMAL_SEL 0x8 - -/* Control Register */ -#define ZX2967_THERMAL_CTRL 0x10 - -#define ZX2967_THERMAL_READY BIT(12) -#define ZX2967_THERMAL_TEMP_MASK GENMASK(11, 0) -#define ZX2967_THERMAL_ID_MASK 0x18 -#define ZX2967_THERMAL_ID 0x10 - -#define ZX2967_GET_TEMP_TIMEOUT_US (100 * 1024) - -/** - * struct zx2967_thermal_priv - zx2967 thermal sensor private structure - * @tzd: struct thermal_zone_device where the sensor is registered - * @lock: prevents read sensor in parallel - * @clk_topcrm: topcrm clk structure - * @clk_apb: apb clk structure - * @regs: pointer to base address of the thermal sensor - * @dev: struct device pointer - */ - -struct zx2967_thermal_priv { - struct thermal_zone_device *tzd; - struct mutex lock; - struct clk *clk_topcrm; - struct clk *clk_apb; - void __iomem *regs; - struct device *dev; -}; - -static int zx2967_thermal_get_temp(void *data, int *temp) -{ - void __iomem *regs; - struct zx2967_thermal_priv *priv = data; - u32 val; - int ret; - - if (!priv->tzd) - return -EAGAIN; - - regs = priv->regs; - mutex_lock(&priv->lock); - writel_relaxed(ZX2967_POWER_MODE_LOW, - regs + ZX2967_THERMAL_POWER_MODE); - writel_relaxed(ZX2967_DCF_EN, regs + ZX2967_THERMAL_DCF); - - val = readl_relaxed(regs + ZX2967_THERMAL_SEL); - val &= ~ZX2967_THERMAL_ID_MASK; - val |= ZX2967_THERMAL_ID; - writel_relaxed(val, regs + ZX2967_THERMAL_SEL); - - /* - * Must wait for a while, surely it's a bit odd. - * otherwise temperature value we got has a few deviation, even if - * the THERMAL_READY bit is set. - */ - usleep_range(100, 300); - ret = readx_poll_timeout(readl, regs + ZX2967_THERMAL_CTRL, - val, val & ZX2967_THERMAL_READY, 300, - ZX2967_GET_TEMP_TIMEOUT_US); - if (ret) { - dev_err(priv->dev, "Thermal sensor data timeout\n"); - goto unlock; - } - - writel_relaxed(ZX2967_DCF_FREEZE | ZX2967_DCF_EN, - regs + ZX2967_THERMAL_DCF); - val = readl_relaxed(regs + ZX2967_THERMAL_CTRL) - & ZX2967_THERMAL_TEMP_MASK; - writel_relaxed(ZX2967_POWER_MODE_HIGH, - regs + ZX2967_THERMAL_POWER_MODE); - - /* - * Calculate temperature - * In dts, slope is multiplied by 1000. - */ - *temp = DIV_ROUND_CLOSEST(((s32)val + priv->tzd->tzp->offset) * 1000, - priv->tzd->tzp->slope); - -unlock: - mutex_unlock(&priv->lock); - return ret; -} - -static const 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; - int ret; - - 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); - - priv->clk_topcrm = devm_clk_get(&pdev->dev, "topcrm"); - if (IS_ERR(priv->clk_topcrm)) { - ret = PTR_ERR(priv->clk_topcrm); - dev_err(&pdev->dev, "failed to get topcrm clock: %d\n", ret); - return ret; - } - - ret = clk_prepare_enable(priv->clk_topcrm); - if (ret) { - dev_err(&pdev->dev, "failed to enable topcrm clock: %d\n", - ret); - return ret; - } - - priv->clk_apb = devm_clk_get(&pdev->dev, "apb"); - if (IS_ERR(priv->clk_apb)) { - ret = PTR_ERR(priv->clk_apb); - dev_err(&pdev->dev, "failed to get apb clock: %d\n", ret); - goto disable_clk_topcrm; - } - - ret = clk_prepare_enable(priv->clk_apb); - if (ret) { - dev_err(&pdev->dev, "failed to enable apb clock: %d\n", - ret); - goto disable_clk_topcrm; - } - - mutex_init(&priv->lock); - priv->tzd = thermal_zone_of_sensor_register(&pdev->dev, - 0, priv, &zx2967_of_thermal_ops); - - if (IS_ERR(priv->tzd)) { - ret = PTR_ERR(priv->tzd); - dev_err(&pdev->dev, "failed to register sensor: %d\n", ret); - goto disable_clk_all; - } - - if (priv->tzd->tzp->slope == 0) { - thermal_zone_of_sensor_unregister(&pdev->dev, priv->tzd); - dev_err(&pdev->dev, "coefficients of sensor is invalid\n"); - ret = -EINVAL; - goto disable_clk_all; - } - - priv->dev = &pdev->dev; - platform_set_drvdata(pdev, priv); - - return 0; - -disable_clk_all: - clk_disable_unprepare(priv->clk_apb); -disable_clk_topcrm: - clk_disable_unprepare(priv->clk_topcrm); - return ret; -} - -static int zx2967_thermal_exit(struct platform_device *pdev) -{ - struct zx2967_thermal_priv *priv = platform_get_drvdata(pdev); - - thermal_zone_of_sensor_unregister(&pdev->dev, priv->tzd); - clk_disable_unprepare(priv->clk_topcrm); - clk_disable_unprepare(priv->clk_apb); - - return 0; -} - -static const struct of_device_id zx2967_thermal_id_table[] = { - { .compatible = "zte,zx296718-thermal" }, - {} -}; -MODULE_DEVICE_TABLE(of, zx2967_thermal_id_table); - -#ifdef CONFIG_PM_SLEEP -static int zx2967_thermal_suspend(struct device *dev) -{ - struct zx2967_thermal_priv *priv = dev_get_drvdata(dev); - - if (priv && priv->clk_topcrm) - clk_disable_unprepare(priv->clk_topcrm); - - if (priv && priv->clk_apb) - clk_disable_unprepare(priv->clk_apb); - - return 0; -} - -static int zx2967_thermal_resume(struct device *dev) -{ - struct zx2967_thermal_priv *priv = dev_get_drvdata(dev); - int error; - - error = clk_prepare_enable(priv->clk_topcrm); - if (error) - return error; - - error = clk_prepare_enable(priv->clk_apb); - if (error) { - clk_disable_unprepare(priv->clk_topcrm); - return error; - } - - return 0; -} -#endif - -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");