From: Kate Hsuan <hpa@redhat.com>
To: Alex Hung <alex.hung@canonical.com>,
Hans de Goede <hdegoede@redhat.com>,
Mark Gross <mgross@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>,
Sujith Thomas <sujith.thomas@intel.com>,
Rajneesh Bhardwaj <irenic.rajneesh@gmail.com>,
Zha Qipeng <qipeng.zha@intel.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
"David E . Box" <david.e.box@linux.intel.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 v3 06/20] platform/x86: intel_scu: Move to intel sub-directory
Date: Thu, 19 Aug 2021 11:29:47 +0800 [thread overview]
Message-ID: <20210819033001.20136-7-hpa@redhat.com> (raw)
In-Reply-To: <20210819033001.20136-1-hpa@redhat.com>
Move intel_scu to intel sub-directory to improve readability.
Signed-off-by: Kate Hsuan <hpa@redhat.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---
drivers/platform/x86/Kconfig | 46 ----------------
drivers/platform/x86/Makefile | 6 +--
drivers/platform/x86/intel/Kconfig | 1 +
drivers/platform/x86/intel/Makefile | 6 +++
drivers/platform/x86/intel/scu/Kconfig | 52 +++++++++++++++++++
drivers/platform/x86/intel/scu/Makefile | 13 +++++
.../x86/{intel_scu_ipc.c => intel/scu/ipc.c} | 0
.../scu/ipcutil.c} | 0
.../scu/pcidrv.c} | 0
.../scu/pltdrv.c} | 0
.../x86/{intel_scu_wdt.c => intel/scu/wdt.c} | 0
11 files changed, 73 insertions(+), 51 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_ipc.c => intel/scu/ipc.c} (100%)
rename drivers/platform/x86/{intel_scu_ipcutil.c => intel/scu/ipcutil.c} (100%)
rename drivers/platform/x86/{intel_scu_pcidrv.c => intel/scu/pcidrv.c} (100%)
rename drivers/platform/x86/{intel_scu_pltdrv.c => intel/scu/pltdrv.c} (100%)
rename drivers/platform/x86/{intel_scu_wdt.c => intel/scu/wdt.c} (100%)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 79b6e0abc2ab..baad2c2bdf5f 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1158,52 +1158,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_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"
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 37ad6a436dda..e6667008fc56 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -128,11 +128,7 @@ obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL) += intel-uncore-frequency.o
# Intel PMIC / PMC / P-Unit devices
-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 e59ff836b592..7ad715f65c01 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -59,5 +59,6 @@ config INTEL_PUNIT_IPC
which is used to bridge the communications between kernel and P-Unit.
source "drivers/platform/x86/intel/pmc/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 1f343ee7c9b4..71ae5db00864 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -18,3 +18,9 @@ obj-$(CONFIG_INTEL_MRFLD_PWRBTN) += intel_mrfld_pwrbtn.o
intel_punit_ipc-y := punit_ipc.o
obj-$(CONFIG_INTEL_PUNIT_IPC) += intel_punit_ipc.o
obj-$(CONFIG_INTEL_PMC_CORE) += pmc/
+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..9e9910ef5349
--- /dev/null
+++ b/drivers/platform/x86/intel/scu/Kconfig
@@ -0,0 +1,52 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Makefile for drivers/platform/x86/intel
+# 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..27af4ba3be89
--- /dev/null
+++ b/drivers/platform/x86/intel/scu/Makefile
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Makefile for drivers/platform/x86/intel
+# Intel x86 Platform-Specific Drivers
+#
+
+obj-$(CONFIG_INTEL_SCU_IPC) += ipc.o
+obj-$(CONFIG_INTEL_SCU_PCI) += pcidrv.o
+obj-$(CONFIG_INTEL_SCU_WDT) += wdt.o
+intel_scu_pltdrv-y := pltdrv.o
+obj-$(CONFIG_INTEL_SCU_PLATFORM) += intel_scu_pltdrv.o
+intel_scu_ipcutil-y := ipcutil.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/ipc.c
similarity index 100%
rename from drivers/platform/x86/intel_scu_ipc.c
rename to drivers/platform/x86/intel/scu/ipc.c
diff --git a/drivers/platform/x86/intel_scu_ipcutil.c b/drivers/platform/x86/intel/scu/ipcutil.c
similarity index 100%
rename from drivers/platform/x86/intel_scu_ipcutil.c
rename to drivers/platform/x86/intel/scu/ipcutil.c
diff --git a/drivers/platform/x86/intel_scu_pcidrv.c b/drivers/platform/x86/intel/scu/pcidrv.c
similarity index 100%
rename from drivers/platform/x86/intel_scu_pcidrv.c
rename to drivers/platform/x86/intel/scu/pcidrv.c
diff --git a/drivers/platform/x86/intel_scu_pltdrv.c b/drivers/platform/x86/intel/scu/pltdrv.c
similarity index 100%
rename from drivers/platform/x86/intel_scu_pltdrv.c
rename to drivers/platform/x86/intel/scu/pltdrv.c
diff --git a/drivers/platform/x86/intel_scu_wdt.c b/drivers/platform/x86/intel/scu/wdt.c
similarity index 100%
rename from drivers/platform/x86/intel_scu_wdt.c
rename to drivers/platform/x86/intel/scu/wdt.c
--
2.31.1
next prev parent reply other threads:[~2021-08-19 3:33 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-19 3:29 [PATCH v3 00/20] Intel platform driver code movement Kate Hsuan
2021-08-19 3:29 ` [PATCH v3 01/20] platform/x86: intel_bxtwc_tmu: Move to intel sub-directory Kate Hsuan
2021-08-19 3:29 ` [PATCH v3 02/20] platform/x86: intel_chtdc_ti_pwrbtn: " Kate Hsuan
2021-08-19 3:29 ` [PATCH v3 03/20] platform/x86: intel_mrfld_pwrbtn: " Kate Hsuan
2021-08-19 3:29 ` [PATCH v3 04/20] platform/x86: intel_punit_ipc: " Kate Hsuan
2021-08-19 3:29 ` [PATCH v3 05/20] platform/x86: intel_pmc_core: " Kate Hsuan
2021-08-19 8:37 ` Hans de Goede
2021-08-19 12:05 ` Andy Shevchenko
2021-08-19 3:29 ` Kate Hsuan [this message]
2021-08-19 8:48 ` [PATCH v3 06/20] platform/x86: intel_scu: " Hans de Goede
2021-08-19 12:08 ` Andy Shevchenko
2021-08-19 3:29 ` [PATCH v3 07/20] platform/x86: intel_telemetry: " Kate Hsuan
2021-08-19 12:11 ` Andy Shevchenko
2021-08-19 3:29 ` [PATCH v3 08/20] platform/x86: intel_ips: " Kate Hsuan
2021-08-19 3:29 ` [PATCH v3 09/20] platform/x86: intel-rst: " Kate Hsuan
2021-08-19 12:13 ` Andy Shevchenko
2021-08-19 3:29 ` [PATCH v3 10/20] platform/x86: intel-smartconnect: " Kate Hsuan
2021-08-19 3:29 ` [PATCH v3 11/20] platform/x86: intel_turbo_max_3: " Kate Hsuan
2021-08-19 3:29 ` [PATCH v3 12/20] platform/x86: intel-uncore-frequency: " Kate Hsuan
2021-08-19 3:29 ` [PATCH v3 13/20] platform/x86: intel_speed_select_if: " Kate Hsuan
2021-08-19 3:29 ` [PATCH v3 14/20] platform/x86: intel_atomisp2_led: " Kate Hsuan
2021-08-19 9:08 ` Hans de Goede
2021-08-19 3:29 ` [PATCH v3 15/20] platform/x86: intel-hid: " Kate Hsuan
2021-08-19 3:29 ` [PATCH v3 16/20] platform/x86: intel_int0002_vgpio: " Kate Hsuan
2021-08-19 3:29 ` [PATCH v3 17/20] platform/x86: intel_oaktrail: " Kate Hsuan
2021-08-19 3:29 ` [PATCH v3 18/20] platform/x86: intel-vbtn: " Kate Hsuan
2021-08-19 3:30 ` [PATCH v3 19/20] platform/x86: intel-wmi-sbl-fw-updat: " Kate Hsuan
2021-08-19 3:30 ` [PATCH v3 20/20] platform/x86: intel-wmi-thunderbolt: " Kate Hsuan
2021-08-19 9:29 ` Hans de Goede
2021-08-19 10:47 ` [PATCH v3 00/20] Intel platform driver code movement Hans de Goede
2021-08-19 12:03 ` Andy Shevchenko
2021-08-19 12:14 ` Andy Shevchenko
2021-08-19 12:46 ` Andy Shevchenko
2021-08-19 13:31 ` Hans de Goede
2021-08-19 13:34 ` Hans de Goede
2021-08-19 14:01 ` Andy Shevchenko
2021-08-19 14:08 ` 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=20210819033001.20136-7-hpa@redhat.com \
--to=hpa@redhat.com \
--cc=Dell.Client.Kernel@dell.com \
--cc=acelan.kao@canonical.com \
--cc=alex.hung@canonical.com \
--cc=david.e.box@linux.intel.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 \
--subject='Re: [PATCH v3 06/20] platform/x86: intel_scu: Move to intel sub-directory' \
/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
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).