From 8bd836feb6cad6bd746da09a86bda0f5ee5c4b01 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Fri, 18 Jun 2021 15:55:15 +0300 Subject: [PATCH] platform/x86: intel_skl_int3472: Move to intel/ subfolder Start collecting Intel x86 related drivers in its own subfolder. Move intel_skl_int3472 first. Signed-off-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210618125516.53510-7-andriy.shevchenko@linux.intel.com Signed-off-by: Hans de Goede --- MAINTAINERS | 2 +- drivers/platform/x86/Kconfig | 4 ++-- drivers/platform/x86/Makefile | 3 ++- drivers/platform/x86/intel/Kconfig | 21 +++++++++++++++++++++ drivers/platform/x86/intel/Makefile | 7 +++++++ .../x86/{intel-int3472 => intel/int3472}/Kconfig | 0 .../x86/{intel-int3472 => intel/int3472}/Makefile | 0 .../int3472}/intel_skl_int3472_clk_and_regulator.c | 0 .../int3472}/intel_skl_int3472_common.c | 0 .../int3472}/intel_skl_int3472_common.h | 0 .../int3472}/intel_skl_int3472_discrete.c | 0 .../int3472}/intel_skl_int3472_tps68470.c | 0 12 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 drivers/platform/x86/intel/Kconfig create mode 100644 drivers/platform/x86/intel/Makefile rename drivers/platform/x86/{intel-int3472 => intel/int3472}/Kconfig (100%) rename drivers/platform/x86/{intel-int3472 => intel/int3472}/Makefile (100%) rename drivers/platform/x86/{intel-int3472 => intel/int3472}/intel_skl_int3472_clk_and_regulator.c (100%) rename drivers/platform/x86/{intel-int3472 => intel/int3472}/intel_skl_int3472_common.c (100%) rename drivers/platform/x86/{intel-int3472 => intel/int3472}/intel_skl_int3472_common.h (100%) rename drivers/platform/x86/{intel-int3472 => intel/int3472}/intel_skl_int3472_discrete.c (100%) rename drivers/platform/x86/{intel-int3472 => intel/int3472}/intel_skl_int3472_tps68470.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 7da4c07..5ca7932 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9388,7 +9388,7 @@ F: drivers/platform/x86/intel_scu_* INTEL SKYLAKE INT3472 ACPI DEVICE DRIVER M: Daniel Scally S: Maintained -F: drivers/platform/x86/intel-int3472/ +F: drivers/platform/x86/intel/int3472/ INTEL SPEED SELECT TECHNOLOGY M: Srinivas Pandruvada diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index ccb827b..79d095c 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -651,6 +651,8 @@ config THINKPAD_LMI To compile this driver as a module, choose M here: the module will be called think-lmi. +source "drivers/platform/x86/intel/Kconfig" + config INTEL_ATOMISP2_LED tristate "Intel AtomISP2 camera LED driver" depends on GPIOLIB && LEDS_GPIO @@ -709,8 +711,6 @@ config INTEL_CHT_INT33FE device and CONFIG_TYPEC_FUSB302=m and CONFIG_BATTERY_MAX17042=m for Type-C device. -source "drivers/platform/x86/intel-int3472/Kconfig" - config INTEL_HID_EVENT tristate "INTEL HID Event" depends on ACPI diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index a1f6461..e03b59c 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -66,6 +66,8 @@ obj-$(CONFIG_THINKPAD_ACPI) += thinkpad_acpi.o obj-$(CONFIG_THINKPAD_LMI) += think-lmi.o # Intel +obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL) += intel/ + obj-$(CONFIG_INTEL_ATOMISP2_LED) += intel_atomisp2_led.o obj-$(CONFIG_INTEL_ATOMISP2_PM) += intel_atomisp2_pm.o obj-$(CONFIG_INTEL_CHT_INT33FE) += intel_cht_int33fe.o @@ -76,7 +78,6 @@ obj-$(CONFIG_INTEL_HID_EVENT) += intel-hid.o obj-$(CONFIG_INTEL_INT0002_VGPIO) += intel_int0002_vgpio.o obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o -obj-$(CONFIG_INTEL_SKL_INT3472) += intel-int3472/ obj-$(CONFIG_INTEL_VBTN) += intel-vbtn.o # MSI diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig new file mode 100644 index 0000000..33f2dab --- /dev/null +++ b/drivers/platform/x86/intel/Kconfig @@ -0,0 +1,21 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# Intel x86 Platform Specific Drivers +# + +menuconfig X86_PLATFORM_DRIVERS_INTEL + bool "Intel x86 Platform Specific Device Drivers" + default y + help + Say Y here to get to see options for device drivers for + various Intel x86 platforms, including vendor-specific + drivers. This option alone does not add any kernel code. + + If you say N, all options in this submenu will be skipped + and disabled. + +if X86_PLATFORM_DRIVERS_INTEL + +source "drivers/platform/x86/intel/int3472/Kconfig" + +endif # X86_PLATFORM_DRIVERS_INTEL diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile new file mode 100644 index 0000000..3ac795d --- /dev/null +++ b/drivers/platform/x86/intel/Makefile @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile for drivers/platform/x86/intel +# Intel x86 Platform-Specific Drivers +# + +obj-$(CONFIG_INTEL_SKL_INT3472) += int3472/ diff --git a/drivers/platform/x86/intel-int3472/Kconfig b/drivers/platform/x86/intel/int3472/Kconfig similarity index 100% rename from drivers/platform/x86/intel-int3472/Kconfig rename to drivers/platform/x86/intel/int3472/Kconfig diff --git a/drivers/platform/x86/intel-int3472/Makefile b/drivers/platform/x86/intel/int3472/Makefile similarity index 100% rename from drivers/platform/x86/intel-int3472/Makefile rename to drivers/platform/x86/intel/int3472/Makefile diff --git a/drivers/platform/x86/intel-int3472/intel_skl_int3472_clk_and_regulator.c b/drivers/platform/x86/intel/int3472/intel_skl_int3472_clk_and_regulator.c similarity index 100% rename from drivers/platform/x86/intel-int3472/intel_skl_int3472_clk_and_regulator.c rename to drivers/platform/x86/intel/int3472/intel_skl_int3472_clk_and_regulator.c diff --git a/drivers/platform/x86/intel-int3472/intel_skl_int3472_common.c b/drivers/platform/x86/intel/int3472/intel_skl_int3472_common.c similarity index 100% rename from drivers/platform/x86/intel-int3472/intel_skl_int3472_common.c rename to drivers/platform/x86/intel/int3472/intel_skl_int3472_common.c diff --git a/drivers/platform/x86/intel-int3472/intel_skl_int3472_common.h b/drivers/platform/x86/intel/int3472/intel_skl_int3472_common.h similarity index 100% rename from drivers/platform/x86/intel-int3472/intel_skl_int3472_common.h rename to drivers/platform/x86/intel/int3472/intel_skl_int3472_common.h diff --git a/drivers/platform/x86/intel-int3472/intel_skl_int3472_discrete.c b/drivers/platform/x86/intel/int3472/intel_skl_int3472_discrete.c similarity index 100% rename from drivers/platform/x86/intel-int3472/intel_skl_int3472_discrete.c rename to drivers/platform/x86/intel/int3472/intel_skl_int3472_discrete.c diff --git a/drivers/platform/x86/intel-int3472/intel_skl_int3472_tps68470.c b/drivers/platform/x86/intel/int3472/intel_skl_int3472_tps68470.c similarity index 100% rename from drivers/platform/x86/intel-int3472/intel_skl_int3472_tps68470.c rename to drivers/platform/x86/intel/int3472/intel_skl_int3472_tps68470.c -- 2.7.4