Skip to content

Commit 72fbcac

Browse files
andy-shevjwrdegoede
authored andcommitted
platform/x86: intel_cht_int33fe: Move to its own subfolder
Since we have started collecting Intel x86 specific drivers in their own folder, move intel_cht_int33fe to its own subfolder there. 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 8bd836f commit 72fbcac

File tree

10 files changed

+31
-28
lines changed

10 files changed

+31
-28
lines changed

drivers/platform/x86/Kconfig

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -687,30 +687,6 @@ config INTEL_ATOMISP2_PM
687687
To compile this driver as a module, choose M here: the module
688688
will be called intel_atomisp2_pm.
689689

690-
config INTEL_CHT_INT33FE
691-
tristate "Intel Cherry Trail ACPI INT33FE Driver"
692-
depends on X86 && ACPI && I2C && REGULATOR
693-
depends on CHARGER_BQ24190=y || (CHARGER_BQ24190=m && m)
694-
depends on USB_ROLES_INTEL_XHCI=y || (USB_ROLES_INTEL_XHCI=m && m)
695-
depends on TYPEC_MUX_PI3USB30532=y || (TYPEC_MUX_PI3USB30532=m && m)
696-
help
697-
This driver add support for the INT33FE ACPI device found on
698-
some Intel Cherry Trail devices.
699-
700-
There are two kinds of INT33FE ACPI device possible: for hardware
701-
with USB Type-C and Micro-B connectors. This driver supports both.
702-
703-
The INT33FE ACPI device has a CRS table with I2cSerialBusV2
704-
resources for Fuel Gauge Controller and (in the Type-C variant)
705-
FUSB302 USB Type-C Controller and PI3USB30532 USB switch.
706-
This driver instantiates i2c-clients for these, so that standard
707-
i2c drivers for these chips can bind to the them.
708-
709-
If you enable this driver it is advised to also select
710-
CONFIG_BATTERY_BQ27XXX=m or CONFIG_BATTERY_BQ27XXX_I2C=m for Micro-B
711-
device and CONFIG_TYPEC_FUSB302=m and CONFIG_BATTERY_MAX17042=m
712-
for Type-C device.
713-
714690
config INTEL_HID_EVENT
715691
tristate "INTEL HID Event"
716692
depends on ACPI

drivers/platform/x86/Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@ obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL) += intel/
7070

7171
obj-$(CONFIG_INTEL_ATOMISP2_LED) += intel_atomisp2_led.o
7272
obj-$(CONFIG_INTEL_ATOMISP2_PM) += intel_atomisp2_pm.o
73-
obj-$(CONFIG_INTEL_CHT_INT33FE) += intel_cht_int33fe.o
74-
intel_cht_int33fe-objs := intel_cht_int33fe_common.o \
75-
intel_cht_int33fe_typec.o \
76-
intel_cht_int33fe_microb.o
7773
obj-$(CONFIG_INTEL_HID_EVENT) += intel-hid.o
7874
obj-$(CONFIG_INTEL_INT0002_VGPIO) += intel_int0002_vgpio.o
7975
obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o

drivers/platform/x86/intel/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ menuconfig X86_PLATFORM_DRIVERS_INTEL
1616

1717
if X86_PLATFORM_DRIVERS_INTEL
1818

19+
source "drivers/platform/x86/intel/int33fe/Kconfig"
1920
source "drivers/platform/x86/intel/int3472/Kconfig"
2021

2122
endif # X86_PLATFORM_DRIVERS_INTEL

drivers/platform/x86/intel/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
# Intel x86 Platform-Specific Drivers
55
#
66

7+
obj-$(CONFIG_INTEL_CHT_INT33FE) += int33fe/
78
obj-$(CONFIG_INTEL_SKL_INT3472) += int3472/
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
config INTEL_CHT_INT33FE
3+
tristate "Intel Cherry Trail ACPI INT33FE Driver"
4+
depends on X86 && ACPI && I2C && REGULATOR
5+
depends on CHARGER_BQ24190=y || (CHARGER_BQ24190=m && m)
6+
depends on USB_ROLES_INTEL_XHCI=y || (USB_ROLES_INTEL_XHCI=m && m)
7+
depends on TYPEC_MUX_PI3USB30532=y || (TYPEC_MUX_PI3USB30532=m && m)
8+
help
9+
This driver add support for the INT33FE ACPI device found on
10+
some Intel Cherry Trail devices.
11+
12+
There are two kinds of INT33FE ACPI device possible: for hardware
13+
with USB Type-C and Micro-B connectors. This driver supports both.
14+
15+
The INT33FE ACPI device has a CRS table with I2cSerialBusV2
16+
resources for Fuel Gauge Controller and (in the Type-C variant)
17+
FUSB302 USB Type-C Controller and PI3USB30532 USB switch.
18+
This driver instantiates i2c-clients for these, so that standard
19+
i2c drivers for these chips can bind to the them.
20+
21+
If you enable this driver it is advised to also select
22+
CONFIG_BATTERY_BQ27XXX=m or CONFIG_BATTERY_BQ27XXX_I2C=m for Micro-B
23+
device and CONFIG_TYPEC_FUSB302=m and CONFIG_BATTERY_MAX17042=m
24+
for Type-C device.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
obj-$(CONFIG_INTEL_CHT_INT33FE) += intel_cht_int33fe.o
3+
intel_cht_int33fe-objs := intel_cht_int33fe_common.o \
4+
intel_cht_int33fe_typec.o \
5+
intel_cht_int33fe_microb.o

0 commit comments

Comments
 (0)