From patchwork Tue Nov 27 18:58:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kucheria X-Patchwork-Id: 152158 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp141165ljp; Tue, 27 Nov 2018 10:59:19 -0800 (PST) X-Google-Smtp-Source: AFSGD/VvsaxHqrDeV1kvnwl2uchg206qyM0LldwwQNIHjkDBSgdhhRGXKWf4aiRWOZV8+l2XduqJ X-Received: by 2002:a62:2c4d:: with SMTP id s74mr31693241pfs.6.1543345158844; Tue, 27 Nov 2018 10:59:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543345158; cv=none; d=google.com; s=arc-20160816; b=H4iZyqSa6QA7sdpH707EHbX3oHIYcWCjMO6QE03MZJuZavSjoN8w51Vh6LeWzEd+0s NTqYGYFAXR4DyXaDKOCOpkS3r9A3wqjlSwAftqPw7b29dD1pZRXXUf7hCZRGWZr15wpT DYR5hyP69qFni5cxWktuygQxceFTnDUvlN+vqMzWXjjLLqr2QeiU6ctFHEvGTfR9zZGk VY0J0yEsGPJW3yo+4kFj+ksPfgIfpUWQlkGIWQHlC7uUanBKSeEk4Sxtcmjb/g7h+1Pr ieoYC0Sc6RikxzwZBBvhYTYFpRk/Bf+ap2XUHickch0Z7DhX309XCCA1VPzmOuvQeVBq t7bA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=VPbmyas9NlZ6E8jNGd5atlSp+2kjXH4RHxf4hQaqr5E=; b=wT7nPWnOSy1jKMrpeRRwb92LSlNZ1vPl2Z32q9JKqYSC0UzuKQDZjNM3p4ISbqoQfb VkSz1EbfqB9zf4HGjc7dXPFFPiecRkDvkjVdvVLlY/RtsRVApqIOxcKAH6rJGMf7LQNJ beXmROQ3PA0USQnkn9jbhpBQnYRxJ1KvQ+dthxaIeEW07Nh+OveJ1s+1Oad13UfTtiC3 sNnmKpciApqP3Lu6D9sYUZidzw4RvZ6hp6Gphr9I9Ppi3kbpIkFd3rpwSur4cvYgWkOY 34ULuMD8s8soF5t/mnetHdrO8G3K0HV83Y3CorIlaO/DYMI5q4LOj9UhSDVuck/WpQ6w RJtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KqHH8yew; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 a19si4296217pgj.429.2018.11.27.10.59.18; Tue, 27 Nov 2018 10:59:18 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-pm-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=KqHH8yew; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 S1728752AbeK1F6H (ORCPT + 11 others); Wed, 28 Nov 2018 00:58:07 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:53279 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729379AbeK1F6H (ORCPT ); Wed, 28 Nov 2018 00:58:07 -0500 Received: by mail-wm1-f65.google.com with SMTP id y1so98421wmi.3 for ; Tue, 27 Nov 2018 10:59:16 -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 :in-reply-to:references; bh=VPbmyas9NlZ6E8jNGd5atlSp+2kjXH4RHxf4hQaqr5E=; b=KqHH8yewrjxLbKLIdYdPuJs7H9D4T2N8PrHGC49h2+HkPYIPgwUCujFbStV1okHUZY soJY9SJRFbKUxw4fGsKwi4ad/KHRIB/ARXkloqfI/tJWbdoa3RF2fBBO67D4nvn8bJV5 4ELMmDzSBQrZxECdrXkLwa9Z2UaIcP8uzy5bw= 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:in-reply-to:references; bh=VPbmyas9NlZ6E8jNGd5atlSp+2kjXH4RHxf4hQaqr5E=; b=tkkNjLnZHl01xi6ZR5ECcvrvFT+NCkuDtvTAimeywFRMjFUNc07pHeHJ67lb1KfA40 F89SxiL3XenNSA/gEipHqqSNqg7TaYzGNyjOZUDQztoDmJwSGU3JtA6SKPNmNlRKIju2 RXFFG8jnjsLnQnG9OIB92mbicTYnu6jD0LoHPZ1Nfx8h3OECmjy+seFs7A6wf2QSGRhN eWc8GPZUFbElFxZEgiow0R+59K4q6Z7nrd0kGP1xakwla4gP7eeo3FGlQDcXj6Qcc3YF Q0+qFmD5qDbz98i/iSX9nc0+QhWOKGg9DzcfzNGtCSRPlDv9+5ikyvZ9K8+GybXxuaSu A2LA== X-Gm-Message-State: AA+aEWZjcVF8tYTxOiYKb2Pf0x6ia2odDtTC0kFCOkonown0X7We1LdN Gw3zqPHluzWQ/0ii4sanurVBBEMAwU8= X-Received: by 2002:a1c:400b:: with SMTP id n11mr73966wma.85.1543345155624; Tue, 27 Nov 2018 10:59:15 -0800 (PST) Received: from localhost ([49.248.92.105]) by smtp.gmail.com with ESMTPSA id 129sm84582wmd.18.2018.11.27.10.59.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Nov 2018 10:59:15 -0800 (PST) From: Amit Kucheria To: linux-kernel@vger.kernel.org Cc: rui.zhang@intel.com, edubezval@gmail.com, linux-pm@vger.kernel.org, Daniel Lezcano Subject: [PATCH v3 2/2] drivers: thermal: Move QCOM_SPMI_TEMP_ALARM into the qcom subdir Date: Wed, 28 Nov 2018 00:28:41 +0530 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org This cleans up the directory a bit allowing just one place to look for thermal related drivers for QCOM platforms instead of being scattered in the root directory and the qcom/ subdirectory. Compile-tested with ARCH=arm64 defconfig and the driver explicitly enabled with menuconfig. Signed-off-by: Amit Kucheria Acked-by: Daniel Lezcano --- drivers/thermal/Kconfig | 11 ----------- drivers/thermal/Makefile | 1 - drivers/thermal/qcom/Kconfig | 11 +++++++++++ drivers/thermal/qcom/Makefile | 1 + drivers/thermal/{ => qcom}/qcom-spmi-temp-alarm.c | 0 5 files changed, 12 insertions(+), 12 deletions(-) rename drivers/thermal/{ => qcom}/qcom-spmi-temp-alarm.c (100%) -- 2.17.1 diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index 772ab9dadda7..344f6459862b 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -374,17 +374,6 @@ config TANGO_THERMAL source "drivers/thermal/tegra/Kconfig" -config QCOM_SPMI_TEMP_ALARM - tristate "Qualcomm SPMI PMIC Temperature Alarm" - depends on OF && SPMI && IIO - select REGMAP_SPMI - help - This enables a thermal sysfs driver for Qualcomm plug-and-play (QPNP) - PMIC devices. It shows up in sysfs as a thermal sensor with multiple - trip points. The temperature reported by the thermal sensor reflects the - real time die temperature if an ADC is present or an estimate of the - temperature based upon the over temperature stage value. - config GENERIC_ADC_THERMAL tristate "Generic ADC based thermal sensor" depends on IIO diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile index 031f61e7dfe8..415361685480 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile @@ -29,7 +29,6 @@ thermal_sys-$(CONFIG_DEVFREQ_THERMAL) += devfreq_cooling.o # platform thermal drivers obj-y += broadcom/ -obj-$(CONFIG_QCOM_SPMI_TEMP_ALARM) += qcom-spmi-temp-alarm.o obj-$(CONFIG_SPEAR_THERMAL) += spear_thermal.o obj-$(CONFIG_ROCKCHIP_THERMAL) += rockchip_thermal.o obj-$(CONFIG_RCAR_THERMAL) += rcar_thermal.o diff --git a/drivers/thermal/qcom/Kconfig b/drivers/thermal/qcom/Kconfig index be32e5abce3c..cdb455ffd575 100644 --- a/drivers/thermal/qcom/Kconfig +++ b/drivers/thermal/qcom/Kconfig @@ -9,3 +9,14 @@ config QCOM_TSENS thermal zone device via the mode file results in disabling the sensor. Also able to set threshold temperature for both hot and cold and update when a threshold is reached. + +config QCOM_SPMI_TEMP_ALARM + tristate "Qualcomm SPMI PMIC Temperature Alarm" + depends on OF && SPMI && IIO + select REGMAP_SPMI + help + This enables a thermal sysfs driver for Qualcomm plug-and-play (QPNP) + PMIC devices. It shows up in sysfs as a thermal sensor with multiple + trip points. The temperature reported by the thermal sensor reflects the + real time die temperature if an ADC is present or an estimate of the + temperature based upon the over temperature stage value. diff --git a/drivers/thermal/qcom/Makefile b/drivers/thermal/qcom/Makefile index a821929ede0b..717a08600bb5 100644 --- a/drivers/thermal/qcom/Makefile +++ b/drivers/thermal/qcom/Makefile @@ -1,2 +1,3 @@ obj-$(CONFIG_QCOM_TSENS) += qcom_tsens.o qcom_tsens-y += tsens.o tsens-common.o tsens-8916.o tsens-8974.o tsens-8960.o tsens-v2.o +obj-$(CONFIG_QCOM_SPMI_TEMP_ALARM) += qcom-spmi-temp-alarm.o diff --git a/drivers/thermal/qcom-spmi-temp-alarm.c b/drivers/thermal/qcom/qcom-spmi-temp-alarm.c similarity index 100% rename from drivers/thermal/qcom-spmi-temp-alarm.c rename to drivers/thermal/qcom/qcom-spmi-temp-alarm.c