platform-driver-x86.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kate Hsuan <hpa@redhat.com>
To: Hans de Goede <hdegoede@redhat.com>,
	Mark Gross <mgross@linux.intel.com>,
	Alex Hung <alex.hung@canonical.com>,
	Sujith Thomas <sujith.thomas@intel.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>,
	Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>,
	AceLan Kao <acelan.kao@canonical.com>,
	Jithu Joseph <jithu.joseph@intel.com>,
	Maurice Ma <maurice.ma@intel.com>,
	Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Dan Carpenter <dan.carpenter@oracle.com>,
	Daniel Scally <djrscally@gmail.com>,
	linux-kernel@vger.kernel.org, Dell.Client.Kernel@dell.com
Cc: platform-driver-x86@vger.kernel.org, Kate Hsuan <hpa@redhat.com>
Subject: [PATCH 09/20] Move Intel SCU IPC of pdx86 to intel directory to increase readability.
Date: Tue, 10 Aug 2021 17:58:21 +0800	[thread overview]
Message-ID: <20210810095832.4234-10-hpa@redhat.com> (raw)
In-Reply-To: <20210810095832.4234-1-hpa@redhat.com>

Signed-off-by: Kate Hsuan <hpa@redhat.com>
---
 drivers/platform/x86/Kconfig                  | 47 -----------------
 drivers/platform/x86/Makefile                 |  6 +--
 drivers/platform/x86/intel/Kconfig            |  1 +
 drivers/platform/x86/intel/Makefile           |  5 ++
 drivers/platform/x86/intel/scu/Kconfig        | 52 +++++++++++++++++++
 drivers/platform/x86/intel/scu/Makefile       | 11 ++++
 .../x86/{ => intel/scu}/intel_scu_ipc.c       |  0
 .../x86/{ => intel/scu}/intel_scu_ipcutil.c   |  0
 .../x86/{ => intel/scu}/intel_scu_pcidrv.c    |  0
 .../x86/{ => intel/scu}/intel_scu_pltdrv.c    |  0
 .../x86/{ => intel/scu}/intel_scu_wdt.c       |  0
 11 files changed, 70 insertions(+), 52 deletions(-)
 create mode 100644 drivers/platform/x86/intel/scu/Kconfig
 create mode 100644 drivers/platform/x86/intel/scu/Makefile
 rename drivers/platform/x86/{ => intel/scu}/intel_scu_ipc.c (100%)
 rename drivers/platform/x86/{ => intel/scu}/intel_scu_ipcutil.c (100%)
 rename drivers/platform/x86/{ => intel/scu}/intel_scu_pcidrv.c (100%)
 rename drivers/platform/x86/{ => intel/scu}/intel_scu_pltdrv.c (100%)
 rename drivers/platform/x86/{ => intel/scu}/intel_scu_wdt.c (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 00fa213e9adb..c8c58a8f0ef9 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1086,53 +1086,6 @@ config INTEL_UNCORE_FREQ_CONTROL
 	  will be called intel-uncore-frequency.
 
 
-config INTEL_SCU_IPC
-	bool
-
-config INTEL_SCU
-	bool
-	select INTEL_SCU_IPC
-
-config INTEL_SCU_PCI
-	bool "Intel SCU PCI driver"
-	depends on PCI
-	select INTEL_SCU
-	help
-	  This driver is used to bridge the communications between kernel
-	  and SCU on some embedded Intel x86 platforms. It also creates
-	  devices that are connected to the SoC through the SCU.
-	  Platforms supported:
-	    Medfield
-	    Clovertrail
-	    Merrifield
-	    Broxton
-	    Apollo Lake
-
-config INTEL_SCU_PLATFORM
-	tristate "Intel SCU platform driver"
-	depends on ACPI
-	select INTEL_SCU
-	help
-	  This driver is used to bridge the communications between kernel
-	  and SCU (sometimes called PMC as well). The driver currently
-	  supports Intel Elkhart Lake and compatible platforms.
-
-config INTEL_SCU_WDT
-	bool
-	default INTEL_SCU_PCI
-	depends on INTEL_MID_WATCHDOG
-	help
-	  This is a specific platform code to instantiate watchdog device
-	  on ACPI-based Intel MID platforms.
-
-config INTEL_SCU_IPC_UTIL
-	tristate "Intel SCU IPC utility driver"
-	depends on INTEL_SCU
-	help
-	  The IPC Util driver provides an interface with the SCU enabling
-	  low level access for debug work and updating the firmware. Say
-	  N unless you will be doing this on an Intel MID platform.
-
 config INTEL_TELEMETRY
 	tristate "Intel SoC Telemetry Driver"
 	depends on X86_64
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index dbb62085e7f9..72b1a4782d48 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -125,11 +125,7 @@ obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)		+= intel-uncore-frequency.o
 
 
 
-obj-$(CONFIG_INTEL_SCU_IPC)		+= intel_scu_ipc.o
-obj-$(CONFIG_INTEL_SCU_PCI)		+= intel_scu_pcidrv.o
-obj-$(CONFIG_INTEL_SCU_PLATFORM)	+= intel_scu_pltdrv.o
-obj-$(CONFIG_INTEL_SCU_WDT)		+= intel_scu_wdt.o
-obj-$(CONFIG_INTEL_SCU_IPC_UTIL)	+= intel_scu_ipcutil.o
+
 obj-$(CONFIG_INTEL_TELEMETRY)		+= intel_telemetry_core.o \
 					   intel_telemetry_pltdrv.o \
 					   intel_telemetry_debugfs.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 189a34226fe0..0f1543dc5299 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -27,6 +27,7 @@ source "drivers/platform/x86/intel/mrfld/Kconfig"
 source "drivers/platform/x86/intel/pmc_core/Kconfig"
 source "drivers/platform/x86/intel/pmt/Kconfig"
 source "drivers/platform/x86/intel/punit/Kconfig"
+source "drivers/platform/x86/intel/scu/Kconfig"
 
 
 endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 9bd49a920900..6fff503ba998 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -22,3 +22,8 @@ obj-$(CONFIG_INTEL_PMT_CLASS)		+= pmt/
 obj-$(CONFIG_INTEL_PMT_TELEMETRY)	+= pmt/
 obj-$(CONFIG_INTEL_PMT_CRASHLOG)	+= pmt/
 obj-$(CONFIG_INTEL_PUNIT_IPC)		+= punit/
+obj-$(CONFIG_INTEL_SCU_IPC)		+= scu/
+obj-$(CONFIG_INTEL_SCU_PCI)		+= scu/
+obj-$(CONFIG_INTEL_SCU_PLATFORM)	+= scu/
+obj-$(CONFIG_INTEL_SCU_WDT)		+= scu/
+obj-$(CONFIG_INTEL_SCU_IPC_UTIL)	+= scu/
diff --git a/drivers/platform/x86/intel/scu/Kconfig b/drivers/platform/x86/intel/scu/Kconfig
new file mode 100644
index 000000000000..ac3b2ab039b4
--- /dev/null
+++ b/drivers/platform/x86/intel/scu/Kconfig
@@ -0,0 +1,52 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+config INTEL_SCU_IPC
+	bool
+
+config INTEL_SCU
+	bool
+	select INTEL_SCU_IPC
+
+config INTEL_SCU_PCI
+	bool "Intel SCU PCI driver"
+	depends on PCI
+	select INTEL_SCU
+	help
+	  This driver is used to bridge the communications between kernel
+	  and SCU on some embedded Intel x86 platforms. It also creates
+	  devices that are connected to the SoC through the SCU.
+	  Platforms supported:
+	    Medfield
+	    Clovertrail
+	    Merrifield
+	    Broxton
+	    Apollo Lake
+
+config INTEL_SCU_PLATFORM
+	tristate "Intel SCU platform driver"
+	depends on ACPI
+	select INTEL_SCU
+	help
+	  This driver is used to bridge the communications between kernel
+	  and SCU (sometimes called PMC as well). The driver currently
+	  supports Intel Elkhart Lake and compatible platforms.
+
+config INTEL_SCU_WDT
+	bool
+	default INTEL_SCU_PCI
+	depends on INTEL_MID_WATCHDOG
+	help
+	  This is a specific platform code to instantiate watchdog device
+	  on ACPI-based Intel MID platforms.
+
+config INTEL_SCU_IPC_UTIL
+	tristate "Intel SCU IPC utility driver"
+	depends on INTEL_SCU
+	help
+	  The IPC Util driver provides an interface with the SCU enabling
+	  low level access for debug work and updating the firmware. Say
+	  N unless you will be doing this on an Intel MID platform.
+
diff --git a/drivers/platform/x86/intel/scu/Makefile b/drivers/platform/x86/intel/scu/Makefile
new file mode 100644
index 000000000000..39cab5f19029
--- /dev/null
+++ b/drivers/platform/x86/intel/scu/Makefile
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Intel x86 Platform Specific Drivers
+#
+
+obj-$(CONFIG_INTEL_SCU_IPC)		+= intel_scu_ipc.o
+obj-$(CONFIG_INTEL_SCU_PCI)		+= intel_scu_pcidrv.o
+obj-$(CONFIG_INTEL_SCU_PLATFORM)	+= intel_scu_pltdrv.o
+obj-$(CONFIG_INTEL_SCU_WDT)		+= intel_scu_wdt.o
+obj-$(CONFIG_INTEL_SCU_IPC_UTIL)	+= intel_scu_ipcutil.o
+
diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel/scu/intel_scu_ipc.c
similarity index 100%
rename from drivers/platform/x86/intel_scu_ipc.c
rename to drivers/platform/x86/intel/scu/intel_scu_ipc.c
diff --git a/drivers/platform/x86/intel_scu_ipcutil.c b/drivers/platform/x86/intel/scu/intel_scu_ipcutil.c
similarity index 100%
rename from drivers/platform/x86/intel_scu_ipcutil.c
rename to drivers/platform/x86/intel/scu/intel_scu_ipcutil.c
diff --git a/drivers/platform/x86/intel_scu_pcidrv.c b/drivers/platform/x86/intel/scu/intel_scu_pcidrv.c
similarity index 100%
rename from drivers/platform/x86/intel_scu_pcidrv.c
rename to drivers/platform/x86/intel/scu/intel_scu_pcidrv.c
diff --git a/drivers/platform/x86/intel_scu_pltdrv.c b/drivers/platform/x86/intel/scu/intel_scu_pltdrv.c
similarity index 100%
rename from drivers/platform/x86/intel_scu_pltdrv.c
rename to drivers/platform/x86/intel/scu/intel_scu_pltdrv.c
diff --git a/drivers/platform/x86/intel_scu_wdt.c b/drivers/platform/x86/intel/scu/intel_scu_wdt.c
similarity index 100%
rename from drivers/platform/x86/intel_scu_wdt.c
rename to drivers/platform/x86/intel/scu/intel_scu_wdt.c
-- 
2.31.1


  parent reply	other threads:[~2021-08-10 10:00 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-10  9:58 [PATCH 00/20] Move Intel platform drivers to intel directory to improve readability Kate Hsuan
2021-08-10  9:58 ` [PATCH 01/20] Move Intel hid of pdx86 " Kate Hsuan
2021-08-10  9:58 ` [PATCH 02/20] Move Intel WMI driver of pdx86 to intel/ " Kate Hsuan
2021-08-10  9:58 ` [PATCH 03/20] Move Intel bxtwc " Kate Hsuan
2021-08-10  9:58 ` [PATCH 04/20] Move Intel chtdc_ti driver of pdx86 " Kate Hsuan
2021-08-10  9:58 ` [PATCH 05/20] Move MRFLD power button driver of pdx86 to intel directory " Kate Hsuan
2021-08-10  9:58 ` [PATCH 06/20] Move Intel PMC core of pdx86 to intel/ " Kate Hsuan
2021-08-10  9:58 ` [PATCH 07/20] Move Intel PMT driver of pdx86 to intel/ " Kate Hsuan
2021-08-10 16:51   ` David E. Box
2021-08-10  9:58 ` [PATCH 08/20] Move Intel P-Unit of pdx86 to intel/ directory " Kate Hsuan
2021-08-10 16:55   ` David E. Box
2021-08-11  5:43     ` Kate Hsuan
2021-08-10  9:58 ` Kate Hsuan [this message]
2021-08-10 10:05   ` [PATCH 09/20] Move Intel SCU IPC of pdx86 to intel directory to increase readability Mika Westerberg
2021-08-10 11:43     ` Kate Hsuan
2021-08-10 13:27       ` Andy Shevchenko
2021-08-10  9:58 ` [PATCH 10/20] Move Intel SoC telemetry driver to intel directory to improve readability Kate Hsuan
2021-08-10  9:58 ` [PATCH 11/20] Move Intel IPS driver of pdx86 " Kate Hsuan
2021-08-10  9:58 ` [PATCH 12/20] Move Intel RST driver of pdx86 to intel directory " Kate Hsuan
2021-08-10  9:58 ` [PATCH 13/20] Move Intel smartconnect driver of pdx86 to intel/ " Kate Hsuan
2021-08-10  9:58 ` [PATCH 14/20] Move Intel SST driver " Kate Hsuan
2021-08-10  9:58 ` [PATCH 15/20] Move Intel turbo max 3 " Kate Hsuan
2021-08-10  9:58 ` [PATCH 16/20] Move Intel uncore freq " Kate Hsuan
2021-08-10  9:58 ` [PATCH 17/20] Move Intel int0002 vgpio driver to intel/ directory to inprove readability Kate Hsuan
2021-08-10  9:58 ` [PATCH 18/20] Move Intel thermal driver for menlow platform driver to intel/ directory to improve readability Kate Hsuan
2021-08-14 10:39   ` Daniel Lezcano
2021-08-15 14:08     ` Hans de Goede
2021-08-16  3:11       ` Pandruvada, Srinivas
2021-08-16  7:40         ` Hans de Goede
2021-08-16  7:43           ` Kate Hsuan
2021-08-10  9:58 ` [PATCH 19/20] Move OakTrail driver to the " Kate Hsuan
2021-08-10  9:58 ` [PATCH 20/20] Move Intel virtual botton driver to " Kate Hsuan
2021-08-10 13:23 ` [PATCH 00/20] Move Intel platform drivers to intel " Andy Shevchenko
2021-08-11 12:41   ` Andy Shevchenko
2021-08-10 14:05 ` Hans de Goede
2021-08-11  9:06   ` Kate Hsuan
2021-08-10 17:03 ` David E. Box
2021-08-10 17:28   ` Randy Dunlap

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=20210810095832.4234-10-hpa@redhat.com \
    --to=hpa@redhat.com \
    --cc=Dell.Client.Kernel@dell.com \
    --cc=acelan.kao@canonical.com \
    --cc=alex.hung@canonical.com \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=dan.carpenter@oracle.com \
    --cc=david.e.box@intel.com \
    --cc=djrscally@gmail.com \
    --cc=hdegoede@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 \
    --cc=sujith.thomas@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).