Skip to content

Commit 8bd836f

Browse files
andy-shevjwrdegoede
authored andcommitted
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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Hans de Goede <[email protected]>
1 parent 7540599 commit 8bd836f

12 files changed

+33
-4
lines changed

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9388,7 +9388,7 @@ F: drivers/platform/x86/intel_scu_*
93889388
INTEL SKYLAKE INT3472 ACPI DEVICE DRIVER
93899389
M: Daniel Scally <[email protected]>
93909390
S: Maintained
9391-
F: drivers/platform/x86/intel-int3472/
9391+
F: drivers/platform/x86/intel/int3472/
93929392

93939393
INTEL SPEED SELECT TECHNOLOGY
93949394
M: Srinivas Pandruvada <[email protected]>

drivers/platform/x86/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -651,6 +651,8 @@ config THINKPAD_LMI
651651
To compile this driver as a module, choose M here: the module will
652652
be called think-lmi.
653653

654+
source "drivers/platform/x86/intel/Kconfig"
655+
654656
config INTEL_ATOMISP2_LED
655657
tristate "Intel AtomISP2 camera LED driver"
656658
depends on GPIOLIB && LEDS_GPIO
@@ -709,8 +711,6 @@ config INTEL_CHT_INT33FE
709711
device and CONFIG_TYPEC_FUSB302=m and CONFIG_BATTERY_MAX17042=m
710712
for Type-C device.
711713

712-
source "drivers/platform/x86/intel-int3472/Kconfig"
713-
714714
config INTEL_HID_EVENT
715715
tristate "INTEL HID Event"
716716
depends on ACPI

drivers/platform/x86/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ obj-$(CONFIG_THINKPAD_ACPI) += thinkpad_acpi.o
6666
obj-$(CONFIG_THINKPAD_LMI) += think-lmi.o
6767

6868
# Intel
69+
obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL) += intel/
70+
6971
obj-$(CONFIG_INTEL_ATOMISP2_LED) += intel_atomisp2_led.o
7072
obj-$(CONFIG_INTEL_ATOMISP2_PM) += intel_atomisp2_pm.o
7173
obj-$(CONFIG_INTEL_CHT_INT33FE) += intel_cht_int33fe.o
@@ -76,7 +78,6 @@ obj-$(CONFIG_INTEL_HID_EVENT) += intel-hid.o
7678
obj-$(CONFIG_INTEL_INT0002_VGPIO) += intel_int0002_vgpio.o
7779
obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o
7880
obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o
79-
obj-$(CONFIG_INTEL_SKL_INT3472) += intel-int3472/
8081
obj-$(CONFIG_INTEL_VBTN) += intel-vbtn.o
8182

8283
# MSI

drivers/platform/x86/intel/Kconfig

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
#
3+
# Intel x86 Platform Specific Drivers
4+
#
5+
6+
menuconfig X86_PLATFORM_DRIVERS_INTEL
7+
bool "Intel x86 Platform Specific Device Drivers"
8+
default y
9+
help
10+
Say Y here to get to see options for device drivers for
11+
various Intel x86 platforms, including vendor-specific
12+
drivers. This option alone does not add any kernel code.
13+
14+
If you say N, all options in this submenu will be skipped
15+
and disabled.
16+
17+
if X86_PLATFORM_DRIVERS_INTEL
18+
19+
source "drivers/platform/x86/intel/int3472/Kconfig"
20+
21+
endif # X86_PLATFORM_DRIVERS_INTEL

drivers/platform/x86/intel/Makefile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
#
3+
# Makefile for drivers/platform/x86/intel
4+
# Intel x86 Platform-Specific Drivers
5+
#
6+
7+
obj-$(CONFIG_INTEL_SKL_INT3472) += int3472/

0 commit comments

Comments
 (0)