Hi,
On 8/19/21 5:29 AM, Kate Hsuan wrote:
> Move intel_scu to intel sub-directory to improve readability.
>
> Signed-off-by: Kate Hsuan <hpa@xxxxxxxxxx>
> Acked-by: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
> ---
> 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/
This will cause make to dive into the scu subdir multiple times.
All CONFIG_INTEL_SCU* symbols either select or depend on CONFIG_INTEL_SCU, so we
can dive into the subdir only once based on this.
Also the Makefile line for diving into subdirs should be kept together.
I'll fix both up while merging the series there is no need for
a new version.
Regards,
Hans
> +
> 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
>
