platform/x86: Remove "default n" entries
Subsystems (2)
PATCH 1/4 platform/x86: Remove "default n" entries
Linus already once did that for PDx86, don't repeat our mistakes. TL;DR: 'n' *is* the default 'default'.
--- drivers/platform/x86/Kconfig | 1 - drivers/platform/x86/dell/Kconfig | 1 - 2 files changed, 2 deletions(-)
drivers/platform/x86/Kconfig +0 -1
@@ -1092,7 +1092,6 @@ config TOUCHSCREEN_DMI config FW_ATTR_CLASS tristate - default n config INTEL_IMR bool "Intel Isolated Memory Region support"
drivers/platform/x86/dell/Kconfig +0 -1
@@ -5,7 +5,6 @@ menuconfig X86_PLATFORM_DRIVERS_DELL bool "Dell X86 Platform Specific Device Drivers" - default n depends on X86_PLATFORM_DEVICES help Say Y here to get to see options for device drivers for various
Signature · 1 line
2.30.2
PATCH 3/4 platform/x86: intel_skl_int3472: Move to intel/ subfolder
Start collecting Intel x86 related drivers in its own subfolder. Move intel_skl_int3472 first.
---
drivers/platform/x86/Kconfig | 4 ++--
drivers/platform/x86/Makefile | 3 ++-
drivers/platform/x86/intel/Kconfig | 21 +++++++++++++++++++
drivers/platform/x86/intel/Makefile | 7 +++++++
.../{intel-int3472 => intel/int3472}/Kconfig | 0
.../{intel-int3472 => intel/int3472}/Makefile | 0
.../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
11 files changed, 32 insertions(+), 3 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%)drivers/platform/x86/Kconfig +2 -2
@@ -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
drivers/platform/x86/Makefile +2 -1
@@ -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
drivers/platform/x86/intel/Kconfig new file +21 -0
@@ -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
drivers/platform/x86/intel/Makefile new file +7 -0
@@ -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/
drivers/platform/x86/intel/int3472/Kconfig renamed from drivers/platform/x86/intel-int3472/Kconfig +0 -0
drivers/platform/x86/intel/int3472/Makefile renamed from drivers/platform/x86/intel-int3472/Makefile +0 -0
drivers/platform/x86/intel/int3472/intel_skl_int3472_clk_and_regulator.c renamed from drivers/platform/x86/intel-int3472/intel_skl_int3472_clk_and_regulator.c +0 -0
drivers/platform/x86/intel/int3472/intel_skl_int3472_common.c renamed from drivers/platform/x86/intel-int3472/intel_skl_int3472_common.c +0 -0
drivers/platform/x86/intel/int3472/intel_skl_int3472_common.h renamed from drivers/platform/x86/intel-int3472/intel_skl_int3472_common.h +0 -0
drivers/platform/x86/intel/int3472/intel_skl_int3472_discrete.c renamed from drivers/platform/x86/intel-int3472/intel_skl_int3472_discrete.c +0 -0
drivers/platform/x86/intel/int3472/intel_skl_int3472_tps68470.c renamed from drivers/platform/x86/intel-int3472/intel_skl_int3472_tps68470.c +0 -0
Signature · 1 line
2.30.2
PATCH 4/4 platform/x86: intel_cht_int33fe: Move to its own subfolder
In reply to Andy ShevchenkoSince we have started collecting Intel x86 specific drivers in its own folder, Move intel_cht_int33fe to own subfolder there.
---
drivers/platform/x86/Kconfig | 24 ------------------
drivers/platform/x86/Makefile | 4 ---
drivers/platform/x86/intel/Kconfig | 1 +
drivers/platform/x86/intel/Makefile | 1 +
drivers/platform/x86/intel/int33fe/Kconfig | 25 +++++++++++++++++++
drivers/platform/x86/intel/int33fe/Makefile | 5 ++++
.../int33fe}/intel_cht_int33fe_common.c | 0
.../int33fe}/intel_cht_int33fe_common.h | 0
.../int33fe}/intel_cht_int33fe_microb.c | 0
.../int33fe}/intel_cht_int33fe_typec.c | 0
10 files changed, 32 insertions(+), 28 deletions(-)
create mode 100644 drivers/platform/x86/intel/int33fe/Kconfig
create mode 100644 drivers/platform/x86/intel/int33fe/Makefile
rename drivers/platform/x86/{ => intel/int33fe}/intel_cht_int33fe_common.c (100%)
rename drivers/platform/x86/{ => intel/int33fe}/intel_cht_int33fe_common.h (100%)
rename drivers/platform/x86/{ => intel/int33fe}/intel_cht_int33fe_microb.c (100%)
rename drivers/platform/x86/{ => intel/int33fe}/intel_cht_int33fe_typec.c (100%)drivers/platform/x86/Kconfig +0 -24
@@ -687,30 +687,6 @@ config INTEL_ATOMISP2_PM To compile this driver as a module, choose M here: the module will be called intel_atomisp2_pm. -config INTEL_CHT_INT33FE - tristate "Intel Cherry Trail ACPI INT33FE Driver" - depends on X86 && ACPI && I2C && REGULATOR - depends on CHARGER_BQ24190=y || (CHARGER_BQ24190=m && m) - depends on USB_ROLES_INTEL_XHCI=y || (USB_ROLES_INTEL_XHCI=m && m) - depends on TYPEC_MUX_PI3USB30532=y || (TYPEC_MUX_PI3USB30532=m && m) - help - This driver add support for the INT33FE ACPI device found on - some Intel Cherry Trail devices. - - There are two kinds of INT33FE ACPI device possible: for hardware - with USB Type-C and Micro-B connectors. This driver supports both. - - The INT33FE ACPI device has a CRS table with I2cSerialBusV2 - resources for Fuel Gauge Controller and (in the Type-C variant) - FUSB302 USB Type-C Controller and PI3USB30532 USB switch. - This driver instantiates i2c-clients for these, so that standard - i2c drivers for these chips can bind to the them. - - If you enable this driver it is advised to also select - CONFIG_BATTERY_BQ27XXX=m or CONFIG_BATTERY_BQ27XXX_I2C=m for Micro-B - device and CONFIG_TYPEC_FUSB302=m and CONFIG_BATTERY_MAX17042=m - for Type-C device. - config INTEL_HID_EVENT tristate "INTEL HID Event" depends on ACPI
drivers/platform/x86/Makefile +0 -4
@@ -70,10 +70,6 @@ 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 -intel_cht_int33fe-objs := intel_cht_int33fe_common.o \ - intel_cht_int33fe_typec.o \ - intel_cht_int33fe_microb.o obj-$(CONFIG_INTEL_HID_EVENT) += intel-hid.o obj-$(CONFIG_INTEL_INT0002_VGPIO) += intel_int0002_vgpio.o obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o
drivers/platform/x86/intel/Kconfig +1 -0
@@ -16,6 +16,7 @@ menuconfig X86_PLATFORM_DRIVERS_INTEL if X86_PLATFORM_DRIVERS_INTEL +source "drivers/platform/x86/intel/int33fe/Kconfig" source "drivers/platform/x86/intel/int3472/Kconfig" endif # X86_PLATFORM_DRIVERS_INTEL
drivers/platform/x86/intel/Makefile +1 -0
@@ -4,4 +4,5 @@ # Intel x86 Platform-Specific Drivers # +obj-$(CONFIG_INTEL_CHT_INT33FE) += int33fe/ obj-$(CONFIG_INTEL_SKL_INT3472) += int3472/
drivers/platform/x86/intel/int33fe/Kconfig new file +25 -0
@@ -0,0 +1,25 @@ +# SPDX-License-Identifier: GPL-2.0-only +config INTEL_CHT_INT33FE + tristate "Intel Cherry Trail ACPI INT33FE Driver" + depends on X86 && ACPI && I2C && REGULATOR + depends on CHARGER_BQ24190=y || (CHARGER_BQ24190=m && m) + depends on USB_ROLES_INTEL_XHCI=y || (USB_ROLES_INTEL_XHCI=m && m) + depends on TYPEC_MUX_PI3USB30532=y || (TYPEC_MUX_PI3USB30532=m && m) + help + This driver add support for the INT33FE ACPI device found on + some Intel Cherry Trail devices. + + There are two kinds of INT33FE ACPI device possible: for hardware + with USB Type-C and Micro-B connectors. This driver supports both. + + The INT33FE ACPI device has a CRS table with I2cSerialBusV2 + resources for Fuel Gauge Controller and (in the Type-C variant) + FUSB302 USB Type-C Controller and PI3USB30532 USB switch. + This driver instantiates i2c-clients for these, so that standard + i2c drivers for these chips can bind to the them. + + If you enable this driver it is advised to also select + CONFIG_BATTERY_BQ27XXX=m or CONFIG_BATTERY_BQ27XXX_I2C=m for Micro-B + device and CONFIG_TYPEC_FUSB302=m and CONFIG_BATTERY_MAX17042=m + for Type-C device. +
drivers/platform/x86/intel/int33fe/Makefile new file +5 -0
@@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_INTEL_CHT_INT33FE) += intel_cht_int33fe.o +intel_cht_int33fe-objs := intel_cht_int33fe_common.o \ + intel_cht_int33fe_typec.o \ + intel_cht_int33fe_microb.o
drivers/platform/x86/intel/int33fe/intel_cht_int33fe_common.c renamed from drivers/platform/x86/intel_cht_int33fe_common.c +0 -0
drivers/platform/x86/intel/int33fe/intel_cht_int33fe_common.h renamed from drivers/platform/x86/intel_cht_int33fe_common.h +0 -0
drivers/platform/x86/intel/int33fe/intel_cht_int33fe_microb.c renamed from drivers/platform/x86/intel_cht_int33fe_microb.c +0 -0
drivers/platform/x86/intel/int33fe/intel_cht_int33fe_typec.c renamed from drivers/platform/x86/intel_cht_int33fe_typec.c +0 -0
Signature · 1 line
2.30.2
PATCH 2/4 platform/x86: intel_skl_int3472: Fix dependencies (drop CLKDEV_LOOKUP)
In reply to Andy ShevchenkoBesides the fact that COMMON_CLK selects CLKDEV_LOOKUP, the latter is going to be removed from clock framework.
--- drivers/platform/x86/intel-int3472/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/intel-int3472/Kconfig +1 -1
@@ -1,7 +1,7 @@ config INTEL_SKL_INT3472 tristate "Intel SkyLake ACPI INT3472 Driver" depends on ACPI - depends on COMMON_CLK && CLKDEV_LOOKUP + depends on COMMON_CLK depends on I2C depends on GPIOLIB depends on REGULATOR
Signature · 1 line
2.30.2
Re: [PATCH v1 2/4] platform/x86: intel_skl_int3472: Fix dependencies (drop CLKDEV_LOOKUP)
Hi Andy
Quoted 1 line · Andy Shevchenko
Besides the fact that
COMMON_CLKselectsCLKDEV_LOOKUP
So it does - thanks
Quoted 4 lines
, the latter
is going to be removed from clock framework.Signed-off-by Andy Shevchenko <[email protected]>
Quoted 17 lines
--- drivers/platform/x86/intel-int3472/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/platform/x86/intel-int3472/Kconfig +1
-1@@ -1,7 +1,7 @@ config INTEL_SKL_INT3472 tristate "Intel SkyLake ACPI INT3472 Driver" depends on ACPI - depends on COMMON_CLK && CLKDEV_LOOKUP + depends on COMMON_CLK depends on I2C depends on GPIOLIB depends on REGULATOR
Re: [PATCH v1 2/4] platform/x86: intel_skl_int3472: Fix dependencies (drop CLKDEV_LOOKUP)
Quoted 8 lines · Daniel Scally
Hi Andy
Quoted 1 line · Andy Shevchenko
Besides the fact that
COMMON_CLKselectsCLKDEV_LOOKUPSo it does - thanks
Quoted 7 lines
Quoted 4 lines
, the latter
is going to be removed from clock framework.Signed-off-by Andy Shevchenko <[email protected]>Reviewed-by Daniel Scally <[email protected]>
Thanks!
I have sent v2 with more patches added (twice bigger than this). Would you be able to test them?
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v1 2/4] platform/x86: intel_skl_int3472: Fix dependencies (drop CLKDEV_LOOKUP)
Hi Andy
Quoted 11 lines · Andy Shevchenko
Quoted 10 lines · Daniel Scally
Hi Andy
Quoted 1 line · Andy Shevchenko
Besides the fact that
COMMON_CLKselectsCLKDEV_LOOKUPSo it does - thanks
Quoted 3 lines
, the latter
is going to be removed from clock framework.
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Andy Shevchenko <[email protected]>Reviewed-by Daniel Scally <[email protected]>Thanks!
I have sent v2 with more patches added (twice bigger than this). Would you be able to test them?
Sure - I'll test them later tonight - thanks!