All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Hans de Goede <hdegoede@redhat.com>,
	Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Kate Hsuan <hpa@redhat.com>,
	Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>,
	linux-kernel@vger.kernel.org,
	platform-driver-x86@vger.kernel.org, Dell.Client.Kernel@dell.com
Cc: Mark Gross <mgross@linux.intel.com>,
	Alex Hung <alex.hung@canonical.com>,
	Rajneesh Bhardwaj <irenic.rajneesh@gmail.com>,
	David E Box <david.e.box@intel.com>,
	Zha Qipeng <qipeng.zha@intel.com>,
	Mika Westerberg <mika.westerberg@linux.intel.com>,
	"David E. Box" <david.e.box@linux.intel.com>,
	AceLan Kao <acelan.kao@canonical.com>,
	Jithu Joseph <jithu.joseph@intel.com>,
	Maurice Ma <maurice.ma@intel.com>
Subject: [PATCH v4 07/21] platform/x86: intel_telemetry: Move to intel sub-directory
Date: Thu, 19 Aug 2021 19:37:21 +0300	[thread overview]
Message-ID: <20210819163735.81803-8-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20210819163735.81803-1-andriy.shevchenko@linux.intel.com>

From: Kate Hsuan <hpa@redhat.com>

Move Intel telemetry driver to intel sub-directory to improve readability.

While at it, spell APL fully in the Kconfig.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 MAINTAINERS                                      |  2 +-
 drivers/platform/x86/Kconfig                     | 12 ------------
 drivers/platform/x86/Makefile                    |  4 ----
 drivers/platform/x86/intel/Kconfig               |  1 +
 drivers/platform/x86/intel/Makefile              |  1 +
 drivers/platform/x86/intel/telemetry/Kconfig     | 16 ++++++++++++++++
 drivers/platform/x86/intel/telemetry/Makefile    | 11 +++++++++++
 .../telemetry/core.c}                            |  0
 .../telemetry/debugfs.c}                         |  0
 .../telemetry/pltdrv.c}                          |  0
 10 files changed, 30 insertions(+), 17 deletions(-)
 create mode 100644 drivers/platform/x86/intel/telemetry/Kconfig
 create mode 100644 drivers/platform/x86/intel/telemetry/Makefile
 rename drivers/platform/x86/{intel_telemetry_core.c => intel/telemetry/core.c} (100%)
 rename drivers/platform/x86/{intel_telemetry_debugfs.c => intel/telemetry/debugfs.c} (100%)
 rename drivers/platform/x86/{intel_telemetry_pltdrv.c => intel/telemetry/pltdrv.c} (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index aa08fdb02ecb..0c73e6216142 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9559,7 +9559,7 @@ M:	"David E. Box" <david.e.box@linux.intel.com>
 L:	platform-driver-x86@vger.kernel.org
 S:	Maintained
 F:	arch/x86/include/asm/intel_telemetry.h
-F:	drivers/platform/x86/intel_telemetry*
+F:	drivers/platform/x86/intel/telemetry/
 
 INTEL UNCORE FREQUENCY CONTROL
 M:	Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 1b85a1f6fc5f..b6e32551a8f5 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1159,18 +1159,6 @@ config INTEL_UNCORE_FREQ_CONTROL
 	  To compile this driver as a module, choose M here: the module
 	  will be called intel-uncore-frequency.
 
-config INTEL_TELEMETRY
-	tristate "Intel SoC Telemetry Driver"
-	depends on X86_64
-	depends on MFD_INTEL_PMC_BXT
-	depends on INTEL_PUNIT_IPC
-	help
-	  This driver provides interfaces to configure and use
-	  telemetry for INTEL SoC from APL onwards. It is also
-	  used to get various SoC events and parameters
-	  directly via debugfs files. Various tools may use
-	  this interface for SoC state monitoring.
-
 endif # X86_PLATFORM_DEVICES
 
 config PMC_ATOM
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 026c97ba68f6..633cc14eba2c 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -126,8 +126,4 @@ obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE)	+= intel_speed_select_if/
 obj-$(CONFIG_INTEL_TURBO_MAX_3)			+= intel_turbo_max_3.o
 obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)		+= intel-uncore-frequency.o
 
-# Intel PMIC / PMC / P-Unit devices
-obj-$(CONFIG_INTEL_TELEMETRY)		+= intel_telemetry_core.o \
-					   intel_telemetry_pltdrv.o \
-					   intel_telemetry_debugfs.o
 obj-$(CONFIG_PMC_ATOM)			+= pmc_atom.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 72f4a5b79342..bedd3bdb0662 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -22,6 +22,7 @@ source "drivers/platform/x86/intel/int3472/Kconfig"
 source "drivers/platform/x86/intel/pmc/Kconfig"
 source "drivers/platform/x86/intel/pmt/Kconfig"
 source "drivers/platform/x86/intel/scu/Kconfig"
+source "drivers/platform/x86/intel/telemetry/Kconfig"
 
 config INTEL_BXTWC_PMIC_TMU
 	tristate "Intel Broxton Whiskey Cove TMU Driver"
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 15e5124d70ec..d446771dbff2 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_INTEL_SKL_INT3472)		+= int3472/
 obj-$(CONFIG_INTEL_PMC_CORE)		+= pmc/
 obj-$(CONFIG_INTEL_PMT_CLASS)		+= pmt/
 obj-$(CONFIG_INTEL_SCU)			+= scu/
+obj-$(CONFIG_INTEL_TELEMETRY)		+= telemetry/
 
 # Intel PMIC / PMC / P-Unit drivers
 intel_bxtwc_tmu-y			:= bxtwc_tmu.o
diff --git a/drivers/platform/x86/intel/telemetry/Kconfig b/drivers/platform/x86/intel/telemetry/Kconfig
new file mode 100644
index 000000000000..da887bd03731
--- /dev/null
+++ b/drivers/platform/x86/intel/telemetry/Kconfig
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_TELEMETRY
+	tristate "Intel SoC Telemetry driver"
+	depends on X86_64
+	depends on MFD_INTEL_PMC_BXT
+	depends on INTEL_PUNIT_IPC
+	help
+	  This driver provides interfaces to configure and use
+	  telemetry for Intel SoC from Apollo Lake onwards.
+	  It is also used to get various SoC events and parameters
+	  directly via debugfs files. Various tools may use
+	  this interface for SoC state monitoring.
diff --git a/drivers/platform/x86/intel/telemetry/Makefile b/drivers/platform/x86/intel/telemetry/Makefile
new file mode 100644
index 000000000000..bfdba5b6c59a
--- /dev/null
+++ b/drivers/platform/x86/intel/telemetry/Makefile
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+intel_telemetry_core-y			:= core.o
+obj-$(CONFIG_INTEL_TELEMETRY)		+= intel_telemetry_core.o
+intel_telemetry_pltdrv-y		:= pltdrv.o
+obj-$(CONFIG_INTEL_TELEMETRY)		+= intel_telemetry_pltdrv.o
+intel_telemetry_debugfs-y		:= debugfs.o
+obj-$(CONFIG_INTEL_TELEMETRY)		+= intel_telemetry_debugfs.o
diff --git a/drivers/platform/x86/intel_telemetry_core.c b/drivers/platform/x86/intel/telemetry/core.c
similarity index 100%
rename from drivers/platform/x86/intel_telemetry_core.c
rename to drivers/platform/x86/intel/telemetry/core.c
diff --git a/drivers/platform/x86/intel_telemetry_debugfs.c b/drivers/platform/x86/intel/telemetry/debugfs.c
similarity index 100%
rename from drivers/platform/x86/intel_telemetry_debugfs.c
rename to drivers/platform/x86/intel/telemetry/debugfs.c
diff --git a/drivers/platform/x86/intel_telemetry_pltdrv.c b/drivers/platform/x86/intel/telemetry/pltdrv.c
similarity index 100%
rename from drivers/platform/x86/intel_telemetry_pltdrv.c
rename to drivers/platform/x86/intel/telemetry/pltdrv.c
-- 
2.32.0


  parent reply	other threads:[~2021-08-19 16:38 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-19 16:37 [PATCH v4 00/21] platform/x86: Intel platform driver code movement Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 01/21] platform/x86: intel_bxtwc_tmu: Move to intel sub-directory Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 02/21] platform/x86: intel_chtdc_ti_pwrbtn: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 03/21] platform/x86: intel_mrfld_pwrbtn: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 04/21] platform/x86: intel_punit_ipc: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 05/21] platform/x86: intel_pmc_core: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 06/21] platform/x86: intel_scu: " Andy Shevchenko
2021-08-19 16:37 ` Andy Shevchenko [this message]
2021-08-19 16:37 ` [PATCH v4 08/21] platform/x86: intel_ips: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 09/21] platform/x86: intel-rst: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 10/21] platform/x86: intel-smartconnect: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 11/21] platform/x86: intel_turbo_max_3: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 12/21] platform/x86: intel-uncore-frequency: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 13/21] platform/x86: intel_speed_select_if: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 14/21] platform/x86: intel_atomisp2: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 15/21] platform/x86: intel-hid: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 16/21] platform/x86: intel_int0002_vgpio: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 17/21] platform/x86: intel_oaktrail: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 18/21] platform/x86: intel-vbtn: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 19/21] platform/x86: intel-wmi-sbl-fw-update: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 20/21] platform/x86: intel-wmi-thunderbolt: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 21/21] platform/x86/intel: scu: Fix doc of intel_scu_ipc_dev_command_with_size() Andy Shevchenko
2021-08-19 17:46 ` [PATCH v4 00/21] platform/x86: Intel platform driver code movement Andy Shevchenko
2021-08-19 18:46 ` Hans de Goede
2021-08-20 10:12   ` Andy Shevchenko
2021-08-20 10:22     ` Hans de Goede

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210819163735.81803-8-andriy.shevchenko@linux.intel.com \
    --to=andriy.shevchenko@linux.intel.com \
    --cc=Dell.Client.Kernel@dell.com \
    --cc=acelan.kao@canonical.com \
    --cc=alex.hung@canonical.com \
    --cc=david.e.box@intel.com \
    --cc=david.e.box@linux.intel.com \
    --cc=hdegoede@redhat.com \
    --cc=hpa@redhat.com \
    --cc=irenic.rajneesh@gmail.com \
    --cc=jithu.joseph@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maurice.ma@intel.com \
    --cc=mgross@linux.intel.com \
    --cc=mika.westerberg@linux.intel.com \
    --cc=platform-driver-x86@vger.kernel.org \
    --cc=qipeng.zha@intel.com \
    --cc=srinivas.pandruvada@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.