From patchwork Thu Oct 4 07:52:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kucheria X-Patchwork-Id: 148109 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp627370lji; Thu, 4 Oct 2018 00:52:31 -0700 (PDT) X-Google-Smtp-Source: ACcGV63W0TbH1qDZggjMZYxwibQ5A3U763euSZeMRfvQ9jUcM3e4M1S0RvI31lMp8PMMX8Y++2Ps X-Received: by 2002:a63:f80a:: with SMTP id n10-v6mr4677291pgh.57.1538639551014; Thu, 04 Oct 2018 00:52:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538639551; cv=none; d=google.com; s=arc-20160816; b=AlFQPUJoeH0cvsSmd9+vlV60OOtoxyCvy6M+gbb7H4cEkASixw4aMIf+hscy+zcqoH G0N2ObJVck2aZ5c3w6ZEBO44cyHSss9yHbE9091Ex3PDrj+IL+stvb9kzX1VX7lKdAZV yATgLTm1vmBLpqGPVEjscp0CjBL7nb9obeXoTzfEEsb9zuiYikjgauPFgISAQMQk0m9y fPqENpMYikhuI6eS2RTkBBFZknKL9AjV3YB5nWe9tUsVV9V0/RoQTjW8rG7ifucKrPrW xHU02vouIPB7BJDlzOHw1fp0jbUOK56LLd8JvpA4dYCwKRoeTsu/fUAiOQzFxk/oMQHf XQSA== 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=Tya4z6o3ipe5TxphbmqNkJ/fCPa3MFDoqND/VyZ5NgM=; b=N0rlb886pdqD6Kq8JYqUPy475Exshigrt4kcvnjuiCK2edbmF75KMJBWpU9sgNs82v kSBf1KPvtUwdhs6UasZrg5YurJr2Nq8X118fIHoDzaCJ1ohItF6nrMF1clMSludjsH9i k/bdnKPM1SeMEzy2qBaFa5aIqBSWsFgOfS99154NbwlOk2Lo1yhmFxYqHxHc7hEGgCzd 4q5CojT2F9QueFPNVQJftMiGP8E1zlvcUU5zZdZKSxkK4XT+vqsmrVryAqDJokbAhGKl XuGgOmVOJepdIVgEpFXwOgkBqplVrggqzYny6SL6wL4E4NRhBohLtWz2Wq2waC6pNlpl qojw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RwfafR86; 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 q4-v6si4359876pli.250.2018.10.04.00.52.30; Thu, 04 Oct 2018 00:52:31 -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=RwfafR86; 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 S1727774AbeJDOo0 (ORCPT + 32 others); Thu, 4 Oct 2018 10:44:26 -0400 Received: from mail-yw1-f67.google.com ([209.85.161.67]:40911 "EHLO mail-yw1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727311AbeJDOo0 (ORCPT ); Thu, 4 Oct 2018 10:44:26 -0400 Received: by mail-yw1-f67.google.com with SMTP id l79-v6so3401533ywc.7 for ; Thu, 04 Oct 2018 00:52:28 -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 :in-reply-to:references; bh=Tya4z6o3ipe5TxphbmqNkJ/fCPa3MFDoqND/VyZ5NgM=; b=RwfafR8635BYZht0uzgevky9wkxqNxmM2JUcRTC4gPOphO5AuxowLIODyedKCnqCXY vUjgooV+wyIHjgk3h36gcWIerTbDSAdP6Kske3MOMM9qmbmFgftvAaaQ2YXBCTzRb/Tv Ssf5PljyT/QDG7u74ar47hFRHxq1aZ1ryLGmQ= 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=Tya4z6o3ipe5TxphbmqNkJ/fCPa3MFDoqND/VyZ5NgM=; b=VTq2nP5Kx6pYuCKlFjmEcJzgk3s2GYNvZqP3TtiDMWHx18/jrOx+SHIVF6SqmzmmKR wEOCg4nLrXnKYYLICmZ2pnrx9LoxO0ml0MPctE9GxwhMI+PxKxyFI1OA496aZ7xPdeQy 4G79YmMF3HBBx6C7s2bYvlo0lOxlRXMdq82BhngXkuChPzxnHkL3r1TiFJ79Jx45NSGz vIsj8LFMRYBLZO1rD4lOhmyIjfUbLvlA8D4V/v3C+tOy/Nfp3yKChfDXurE5DvQjMHRB VodldM83it2oL+3085apNKrK4lO6AO+7BQ4sQUhh3dS87at8qXmyXnc51ssU3rzF3IHt b1fQ== X-Gm-Message-State: ABuFfojDaoqQy404Ge+hI4EbldfI/y8WXF1QXoA0suwETcBTrlLJRix2 0bb9Pa1i2v0w8Ynm5qYAt0ZpVMOoKZvCog== X-Received: by 2002:a81:4328:: with SMTP id q40-v6mr2705575ywa.187.1538639547840; Thu, 04 Oct 2018 00:52:27 -0700 (PDT) Received: from localhost ([202.189.238.75]) by smtp.gmail.com with ESMTPSA id n186-v6sm2379126ywn.16.2018.10.04.00.52.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 04 Oct 2018 00:52:27 -0700 (PDT) From: Amit Kucheria To: linux-kernel@vger.kernel.org Cc: mka@chromium.org, rui.zhang@intel.com, edubezval@gmail.com, Daniel Lezcano Subject: [PATCH v2 1/2] drivers: thermal: Move various drivers for intel platforms into a subdir Date: Thu, 4 Oct 2018 13:22:11 +0530 Message-Id: <9c9787d7a3c07742ac61f390c7600082752dc12e.1538638640.git.amit.kucheria@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This cleans up the directory a bit, now that we have several other platforms using platform-specific sub-directories. Compile-tested with ARCH=x86 defconfig and the drivers explicitly enabled with menuconfig. Signed-off-by: Amit Kucheria Acked-by: Daniel Lezcano --- drivers/thermal/Kconfig | 83 ++----------------- drivers/thermal/Makefile | 9 +- drivers/thermal/intel/Kconfig | 77 +++++++++++++++++ drivers/thermal/intel/Makefile | 12 +++ .../{ => intel}/int340x_thermal/Kconfig | 0 .../{ => intel}/int340x_thermal/Makefile | 0 .../int340x_thermal/acpi_thermal_rel.c | 0 .../int340x_thermal/acpi_thermal_rel.h | 0 .../int340x_thermal/int3400_thermal.c | 0 .../int340x_thermal/int3402_thermal.c | 0 .../int340x_thermal/int3403_thermal.c | 0 .../int340x_thermal/int3406_thermal.c | 0 .../int340x_thermal/int340x_thermal_zone.c | 0 .../int340x_thermal/int340x_thermal_zone.h | 0 .../processor_thermal_device.c | 0 .../{ => intel}/intel_bxt_pmic_thermal.c | 0 .../thermal/{ => intel}/intel_pch_thermal.c | 0 .../thermal/{ => intel}/intel_powerclamp.c | 0 .../{ => intel}/intel_quark_dts_thermal.c | 0 .../thermal/{ => intel}/intel_soc_dts_iosf.c | 0 .../thermal/{ => intel}/intel_soc_dts_iosf.h | 0 .../{ => intel}/intel_soc_dts_thermal.c | 0 .../{ => intel}/x86_pkg_temp_thermal.c | 0 23 files changed, 95 insertions(+), 86 deletions(-) create mode 100644 drivers/thermal/intel/Kconfig create mode 100644 drivers/thermal/intel/Makefile rename drivers/thermal/{ => intel}/int340x_thermal/Kconfig (100%) rename drivers/thermal/{ => intel}/int340x_thermal/Makefile (100%) rename drivers/thermal/{ => intel}/int340x_thermal/acpi_thermal_rel.c (100%) rename drivers/thermal/{ => intel}/int340x_thermal/acpi_thermal_rel.h (100%) rename drivers/thermal/{ => intel}/int340x_thermal/int3400_thermal.c (100%) rename drivers/thermal/{ => intel}/int340x_thermal/int3402_thermal.c (100%) rename drivers/thermal/{ => intel}/int340x_thermal/int3403_thermal.c (100%) rename drivers/thermal/{ => intel}/int340x_thermal/int3406_thermal.c (100%) rename drivers/thermal/{ => intel}/int340x_thermal/int340x_thermal_zone.c (100%) rename drivers/thermal/{ => intel}/int340x_thermal/int340x_thermal_zone.h (100%) rename drivers/thermal/{ => intel}/int340x_thermal/processor_thermal_device.c (100%) rename drivers/thermal/{ => intel}/intel_bxt_pmic_thermal.c (100%) rename drivers/thermal/{ => intel}/intel_pch_thermal.c (100%) rename drivers/thermal/{ => intel}/intel_powerclamp.c (100%) rename drivers/thermal/{ => intel}/intel_quark_dts_thermal.c (100%) rename drivers/thermal/{ => intel}/intel_soc_dts_iosf.c (100%) rename drivers/thermal/{ => intel}/intel_soc_dts_iosf.h (100%) rename drivers/thermal/{ => intel}/intel_soc_dts_thermal.c (100%) rename drivers/thermal/{ => intel}/x86_pkg_temp_thermal.c (100%) -- 2.17.1 diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index 0e69edc77d18..6f18110f1480 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -326,84 +326,6 @@ config DA9062_THERMAL zone. Compatible with the DA9062 and DA9061 PMICs. -config INTEL_POWERCLAMP - tristate "Intel PowerClamp idle injection driver" - depends on THERMAL - depends on X86 - depends on CPU_SUP_INTEL - help - Enable this to enable Intel PowerClamp idle injection driver. This - enforce idle time which results in more package C-state residency. The - user interface is exposed via generic thermal framework. - -config X86_PKG_TEMP_THERMAL - tristate "X86 package temperature thermal driver" - depends on X86_THERMAL_VECTOR - select THERMAL_GOV_USER_SPACE - select THERMAL_WRITABLE_TRIPS - default m - help - Enable this to register CPU digital sensor for package temperature as - thermal zone. Each package will have its own thermal zone. There are - two trip points which can be set by user to get notifications via thermal - notification methods. - -config INTEL_SOC_DTS_IOSF_CORE - tristate - depends on X86 && PCI - select IOSF_MBI - help - This is becoming a common feature for Intel SoCs to expose the additional - digital temperature sensors (DTSs) using side band interface (IOSF). This - implements the common set of helper functions to register, get temperature - and get/set thresholds on DTSs. - -config INTEL_SOC_DTS_THERMAL - tristate "Intel SoCs DTS thermal driver" - depends on X86 && PCI && ACPI - select INTEL_SOC_DTS_IOSF_CORE - select THERMAL_WRITABLE_TRIPS - help - Enable this to register Intel SoCs (e.g. Bay Trail) platform digital - temperature sensor (DTS). These SoCs have two additional DTSs in - addition to DTSs on CPU cores. Each DTS will be registered as a - thermal zone. There are two trip points. One of the trip point can - be set by user mode programs to get notifications via Linux thermal - notification methods.The other trip is a critical trip point, which - was set by the driver based on the TJ MAX temperature. - -config INTEL_QUARK_DTS_THERMAL - tristate "Intel Quark DTS thermal driver" - depends on X86_INTEL_QUARK - help - Enable this to register Intel Quark SoC (e.g. X1000) platform digital - temperature sensor (DTS). For X1000 SoC, it has one on-die DTS. - The DTS will be registered as a thermal zone. There are two trip points: - hot & critical. The critical trip point default value is set by - underlying BIOS/Firmware. - -menu "ACPI INT340X thermal drivers" -source drivers/thermal/int340x_thermal/Kconfig -endmenu - -config INTEL_BXT_PMIC_THERMAL - tristate "Intel Broxton PMIC thermal driver" - depends on X86 && INTEL_SOC_PMIC_BXTWC && REGMAP - help - Select this driver for Intel Broxton PMIC with ADC channels monitoring - system temperature measurements and alerts. - This driver is used for monitoring the ADC channels of PMIC and handles - the alert trip point interrupts and notifies the thermal framework with - the trip point and temperature details of the zone. - -config INTEL_PCH_THERMAL - tristate "Intel PCH Thermal Reporting Driver" - depends on X86 && PCI - help - Enable this to support thermal reporting on certain intel PCHs. - Thermal reporting device will provide temperature reading, - programmable trip points and other information. - config MTK_THERMAL tristate "Temperature sensor driver for mediatek SoCs" depends on ARCH_MEDIATEK || COMPILE_TEST @@ -415,6 +337,11 @@ config MTK_THERMAL Enable this option if you want to have support for thermal management controller present in Mediatek SoCs +menu "Intel thermal drivers" +depends on X86 || X86_INTEL_QUARK || COMPILE_TEST +source "drivers/thermal/intel/Kconfig" +endmenu + menu "Broadcom thermal drivers" depends on ARCH_BCM || ARCH_BRCMSTB || ARCH_BCM2835 || COMPILE_TEST source "drivers/thermal/broadcom/Kconfig" diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile index 610344eb3e03..031f61e7dfe8 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile @@ -44,15 +44,8 @@ obj-$(CONFIG_IMX_THERMAL) += imx_thermal.o obj-$(CONFIG_MAX77620_THERMAL) += max77620_thermal.o obj-$(CONFIG_QORIQ_THERMAL) += qoriq_thermal.o obj-$(CONFIG_DA9062_THERMAL) += da9062-thermal.o -obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.o -obj-$(CONFIG_X86_PKG_TEMP_THERMAL) += x86_pkg_temp_thermal.o -obj-$(CONFIG_INTEL_SOC_DTS_IOSF_CORE) += intel_soc_dts_iosf.o -obj-$(CONFIG_INTEL_SOC_DTS_THERMAL) += intel_soc_dts_thermal.o -obj-$(CONFIG_INTEL_QUARK_DTS_THERMAL) += intel_quark_dts_thermal.o +obj-y += intel/ obj-$(CONFIG_TI_SOC_THERMAL) += ti-soc-thermal/ -obj-$(CONFIG_INT340X_THERMAL) += int340x_thermal/ -obj-$(CONFIG_INTEL_BXT_PMIC_THERMAL) += intel_bxt_pmic_thermal.o -obj-$(CONFIG_INTEL_PCH_THERMAL) += intel_pch_thermal.o obj-$(CONFIG_ST_THERMAL) += st/ obj-$(CONFIG_QCOM_TSENS) += qcom/ obj-y += tegra/ diff --git a/drivers/thermal/intel/Kconfig b/drivers/thermal/intel/Kconfig new file mode 100644 index 000000000000..9c06d4ad7c97 --- /dev/null +++ b/drivers/thermal/intel/Kconfig @@ -0,0 +1,77 @@ +config INTEL_POWERCLAMP + tristate "Intel PowerClamp idle injection driver" + depends on THERMAL + depends on X86 + depends on CPU_SUP_INTEL + help + Enable this to enable Intel PowerClamp idle injection driver. This + enforce idle time which results in more package C-state residency. The + user interface is exposed via generic thermal framework. + +config X86_PKG_TEMP_THERMAL + tristate "X86 package temperature thermal driver" + depends on X86_THERMAL_VECTOR + select THERMAL_GOV_USER_SPACE + select THERMAL_WRITABLE_TRIPS + default m + help + Enable this to register CPU digital sensor for package temperature as + thermal zone. Each package will have its own thermal zone. There are + two trip points which can be set by user to get notifications via thermal + notification methods. + +config INTEL_SOC_DTS_IOSF_CORE + tristate + depends on X86 && PCI + select IOSF_MBI + help + This is becoming a common feature for Intel SoCs to expose the additional + digital temperature sensors (DTSs) using side band interface (IOSF). This + implements the common set of helper functions to register, get temperature + and get/set thresholds on DTSs. + +config INTEL_SOC_DTS_THERMAL + tristate "Intel SoCs DTS thermal driver" + depends on X86 && PCI && ACPI + select INTEL_SOC_DTS_IOSF_CORE + select THERMAL_WRITABLE_TRIPS + help + Enable this to register Intel SoCs (e.g. Bay Trail) platform digital + temperature sensor (DTS). These SoCs have two additional DTSs in + addition to DTSs on CPU cores. Each DTS will be registered as a + thermal zone. There are two trip points. One of the trip point can + be set by user mode programs to get notifications via Linux thermal + notification methods.The other trip is a critical trip point, which + was set by the driver based on the TJ MAX temperature. + +config INTEL_QUARK_DTS_THERMAL + tristate "Intel Quark DTS thermal driver" + depends on X86_INTEL_QUARK + help + Enable this to register Intel Quark SoC (e.g. X1000) platform digital + temperature sensor (DTS). For X1000 SoC, it has one on-die DTS. + The DTS will be registered as a thermal zone. There are two trip points: + hot & critical. The critical trip point default value is set by + underlying BIOS/Firmware. + +menu "ACPI INT340X thermal drivers" +source drivers/thermal/intel/int340x_thermal/Kconfig +endmenu + +config INTEL_BXT_PMIC_THERMAL + tristate "Intel Broxton PMIC thermal driver" + depends on X86 && INTEL_SOC_PMIC_BXTWC && REGMAP + help + Select this driver for Intel Broxton PMIC with ADC channels monitoring + system temperature measurements and alerts. + This driver is used for monitoring the ADC channels of PMIC and handles + the alert trip point interrupts and notifies the thermal framework with + the trip point and temperature details of the zone. + +config INTEL_PCH_THERMAL + tristate "Intel PCH Thermal Reporting Driver" + depends on X86 && PCI + help + Enable this to support thermal reporting on certain intel PCHs. + Thermal reporting device will provide temperature reading, + programmable trip points and other information. diff --git a/drivers/thermal/intel/Makefile b/drivers/thermal/intel/Makefile new file mode 100644 index 000000000000..0d9736ced5d4 --- /dev/null +++ b/drivers/thermal/intel/Makefile @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile for various Intel thermal drivers. + +obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.o +obj-$(CONFIG_X86_PKG_TEMP_THERMAL) += x86_pkg_temp_thermal.o +obj-$(CONFIG_INTEL_SOC_DTS_IOSF_CORE) += intel_soc_dts_iosf.o +obj-$(CONFIG_INTEL_SOC_DTS_THERMAL) += intel_soc_dts_thermal.o +obj-$(CONFIG_INTEL_QUARK_DTS_THERMAL) += intel_quark_dts_thermal.o +obj-$(CONFIG_INT340X_THERMAL) += int340x_thermal/ +obj-$(CONFIG_INTEL_BXT_PMIC_THERMAL) += intel_bxt_pmic_thermal.o +obj-$(CONFIG_INTEL_PCH_THERMAL) += intel_pch_thermal.o diff --git a/drivers/thermal/int340x_thermal/Kconfig b/drivers/thermal/intel/int340x_thermal/Kconfig similarity index 100% rename from drivers/thermal/int340x_thermal/Kconfig rename to drivers/thermal/intel/int340x_thermal/Kconfig diff --git a/drivers/thermal/int340x_thermal/Makefile b/drivers/thermal/intel/int340x_thermal/Makefile similarity index 100% rename from drivers/thermal/int340x_thermal/Makefile rename to drivers/thermal/intel/int340x_thermal/Makefile diff --git a/drivers/thermal/int340x_thermal/acpi_thermal_rel.c b/drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.c similarity index 100% rename from drivers/thermal/int340x_thermal/acpi_thermal_rel.c rename to drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.c diff --git a/drivers/thermal/int340x_thermal/acpi_thermal_rel.h b/drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.h similarity index 100% rename from drivers/thermal/int340x_thermal/acpi_thermal_rel.h rename to drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.h diff --git a/drivers/thermal/int340x_thermal/int3400_thermal.c b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c similarity index 100% rename from drivers/thermal/int340x_thermal/int3400_thermal.c rename to drivers/thermal/intel/int340x_thermal/int3400_thermal.c diff --git a/drivers/thermal/int340x_thermal/int3402_thermal.c b/drivers/thermal/intel/int340x_thermal/int3402_thermal.c similarity index 100% rename from drivers/thermal/int340x_thermal/int3402_thermal.c rename to drivers/thermal/intel/int340x_thermal/int3402_thermal.c diff --git a/drivers/thermal/int340x_thermal/int3403_thermal.c b/drivers/thermal/intel/int340x_thermal/int3403_thermal.c similarity index 100% rename from drivers/thermal/int340x_thermal/int3403_thermal.c rename to drivers/thermal/intel/int340x_thermal/int3403_thermal.c diff --git a/drivers/thermal/int340x_thermal/int3406_thermal.c b/drivers/thermal/intel/int340x_thermal/int3406_thermal.c similarity index 100% rename from drivers/thermal/int340x_thermal/int3406_thermal.c rename to drivers/thermal/intel/int340x_thermal/int3406_thermal.c diff --git a/drivers/thermal/int340x_thermal/int340x_thermal_zone.c b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c similarity index 100% rename from drivers/thermal/int340x_thermal/int340x_thermal_zone.c rename to drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c diff --git a/drivers/thermal/int340x_thermal/int340x_thermal_zone.h b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h similarity index 100% rename from drivers/thermal/int340x_thermal/int340x_thermal_zone.h rename to drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h diff --git a/drivers/thermal/int340x_thermal/processor_thermal_device.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c similarity index 100% rename from drivers/thermal/int340x_thermal/processor_thermal_device.c rename to drivers/thermal/intel/int340x_thermal/processor_thermal_device.c diff --git a/drivers/thermal/intel_bxt_pmic_thermal.c b/drivers/thermal/intel/intel_bxt_pmic_thermal.c similarity index 100% rename from drivers/thermal/intel_bxt_pmic_thermal.c rename to drivers/thermal/intel/intel_bxt_pmic_thermal.c diff --git a/drivers/thermal/intel_pch_thermal.c b/drivers/thermal/intel/intel_pch_thermal.c similarity index 100% rename from drivers/thermal/intel_pch_thermal.c rename to drivers/thermal/intel/intel_pch_thermal.c diff --git a/drivers/thermal/intel_powerclamp.c b/drivers/thermal/intel/intel_powerclamp.c similarity index 100% rename from drivers/thermal/intel_powerclamp.c rename to drivers/thermal/intel/intel_powerclamp.c diff --git a/drivers/thermal/intel_quark_dts_thermal.c b/drivers/thermal/intel/intel_quark_dts_thermal.c similarity index 100% rename from drivers/thermal/intel_quark_dts_thermal.c rename to drivers/thermal/intel/intel_quark_dts_thermal.c diff --git a/drivers/thermal/intel_soc_dts_iosf.c b/drivers/thermal/intel/intel_soc_dts_iosf.c similarity index 100% rename from drivers/thermal/intel_soc_dts_iosf.c rename to drivers/thermal/intel/intel_soc_dts_iosf.c diff --git a/drivers/thermal/intel_soc_dts_iosf.h b/drivers/thermal/intel/intel_soc_dts_iosf.h similarity index 100% rename from drivers/thermal/intel_soc_dts_iosf.h rename to drivers/thermal/intel/intel_soc_dts_iosf.h diff --git a/drivers/thermal/intel_soc_dts_thermal.c b/drivers/thermal/intel/intel_soc_dts_thermal.c similarity index 100% rename from drivers/thermal/intel_soc_dts_thermal.c rename to drivers/thermal/intel/intel_soc_dts_thermal.c diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/intel/x86_pkg_temp_thermal.c similarity index 100% rename from drivers/thermal/x86_pkg_temp_thermal.c rename to drivers/thermal/intel/x86_pkg_temp_thermal.c From patchwork Thu Oct 4 07:52:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kucheria X-Patchwork-Id: 148110 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp627443lji; Thu, 4 Oct 2018 00:52:37 -0700 (PDT) X-Google-Smtp-Source: ACcGV62NPoxdqWaQ51K8OCdykj0I76HDijrvw/xvsljjHXyZ0yHnNSlWADFJr7NeBBIFuej58rhB X-Received: by 2002:a63:aa48:: with SMTP id x8-v6mr4548072pgo.87.1538639557150; Thu, 04 Oct 2018 00:52:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538639557; cv=none; d=google.com; s=arc-20160816; b=NptXybVuvW+DIHqX1rjTo2jnYmFvqa4mbOC8YgdlXSM5HCfuxXXu5kEB9K27dBHsbM FDTFoEWjhD7uTveijR5wxqSCtz2n+Z7DH94OnC2e8IH9AbbN9DdsMGfEpXvBCFqErXbL +e8ATYAB8ygCqAm6W1tJ/ChFR3z54smc9jt7aaOnT6C3fMKTA3myNwkswY59lIUun2Tx A4Wbr1o4QMexa7B7NgDvrBTLCVxdxIWmm8rprpfbtr7lMv/excP+2gAzsjMtV1z8Bqzp 32zAvI7mqzIiubW5+96tWtf8u4HWtGkgEbkKAhs6x/cHDTZbgFWvkzDjuheZ+dQWpkHu yAmg== 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=JWF3lv0izd3kQMjG0xl0p6X0RF+nnvok+00YcCm5gOs=; b=eAD91s1V4aXSiVj8G4m+NDnXrPEo/HhMq2wV6wq7RX/jO+eKScrOEqdK26ZuW2WQn2 cWDxW/ciI4QYa+c1xfHoq5T9jwlypb1VVGCosgkzRreI2VWXu1W7zPNGCWFzfrCUfeKQ gKPYWnHUwBtQACxTe9dqWjfR/NoVBaMceO0N28/z3GSH3X1seH9HcgTzAzF0/VGJxq/H degg2VyLkmguhSsLMFaiQY8odfhzJdHytKfJlikpnl7Nn3UhkrQ2kHhJ5KiKpQdkV65R TH6COMpth3OJRaAgEHGwBNbf0IynY2yblS/wx1CVcUap6nMNSchyi/G7+P6Wo+Ka2f8Q 49vA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JTnSzD4I; 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 r10-v6si3402759pgg.259.2018.10.04.00.52.36; Thu, 04 Oct 2018 00:52: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=JTnSzD4I; 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 S1727808AbeJDOoc (ORCPT + 32 others); Thu, 4 Oct 2018 10:44:32 -0400 Received: from mail-yw1-f67.google.com ([209.85.161.67]:39743 "EHLO mail-yw1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727311AbeJDOoc (ORCPT ); Thu, 4 Oct 2018 10:44:32 -0400 Received: by mail-yw1-f67.google.com with SMTP id v1-v6so3407122ywv.6 for ; Thu, 04 Oct 2018 00:52:33 -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 :in-reply-to:references; bh=JWF3lv0izd3kQMjG0xl0p6X0RF+nnvok+00YcCm5gOs=; b=JTnSzD4ISv3NpGnG8grQVMXZOkb6EHGUk8RgurbOkoOaSb2zj2CAj9B2U2orPQ15+V ziNjwm9NJKME3kPYaOQAzhU69ZIMu0fudrneuNkOWz60h6UhJ2BVbrNQWIYnGQ+Ijzlo yrP0UhMh57vtadu5LUBkS6oNMxGaZTwG7oD38= 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=JWF3lv0izd3kQMjG0xl0p6X0RF+nnvok+00YcCm5gOs=; b=Bv8K9DFPOQQxNDaeO1++XslOL3tYv3aNCwVpzgt/gGJpvx0fd6vKVs0iSU8hwnJe9L UnnGwWufuyO+ogVxND4mStdVKZOKY4c2LJve3sRKF0McDePUi8f+M/0FRqYw0ha8m953 UFLLV1HhTi1gyKs5TBPnjxUYDYxyW0a/M0rz0GUsw0/rXa1DB850gYGJ6B/ERPTGPe5i KLLg/q27ZLJpd6BLTozL6lJeVT3ZnH88mXIiu/HqEVMzUUyXxVAMOFxN84rGc1b/ax4p sJBNtNZnddoNkK0Gtk2I81qi3lr/L2Bwoe22kk1TYnlIGWeR9I8Th128zd5EO6G8B0MS Z8WA== X-Gm-Message-State: ABuFfog9qFEemUtHxsbkxthgcMEjmFafhKP9ToGRhz5hRHUvhNKSSHFP cRW43UmVxT7QH710wjgToHlq7FTv1DdITw== X-Received: by 2002:a0d:d302:: with SMTP id v2-v6mr2924185ywd.124.1538639553115; Thu, 04 Oct 2018 00:52:33 -0700 (PDT) Received: from localhost ([202.189.238.75]) by smtp.gmail.com with ESMTPSA id y198-v6sm1650915ywy.64.2018.10.04.00.52.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 04 Oct 2018 00:52:32 -0700 (PDT) From: Amit Kucheria To: linux-kernel@vger.kernel.org Cc: mka@chromium.org, rui.zhang@intel.com, edubezval@gmail.com, Daniel Lezcano Subject: [PATCH v2 2/2] drivers: thermal: Move QCOM_SPMI_TEMP_ALARM into the qcom subdir Date: Thu, 4 Oct 2018 13:22:12 +0530 Message-Id: <18c718d98eeb519c14c52b02141783f93b95442c.1538638640.git.amit.kucheria@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 6f18110f1480..c075f1190e63 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