Commit ae707d0e authored by Hans de Goede's avatar Hans de Goede
Browse files

platform/x86: intel_cht_int33fe: Move to intel directory 



Now that there is only 1 c-file left of the intel_cht_int33fe code,
move it to the intel directory instead of it having its own int33fe
sub-directory.

Note this also renames the module from intel_cht_int33fe_typec to
intel_chtwc_int33fe, to better match the names of other PMIC related
modules like the intel_chtdc_ti_pwrbtn module.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20220206220220.88491-4-hdegoede@redhat.com
parent bb22fc51

drivers/platform/x86/intel/Kconfig

+20 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 


source "drivers/platform/x86/intel/atomisp2/Kconfig"

source "drivers/platform/x86/intel/int1092/Kconfig"

source "drivers/platform/x86/intel/int33fe/Kconfig"

source "drivers/platform/x86/intel/int3472/Kconfig"

source "drivers/platform/x86/intel/pmc/Kconfig"

source "drivers/platform/x86/intel/pmt/Kconfig"
@@ -89,6 +88,26 @@ config INTEL_CHTDC_TI_PWRBTN 
	  To compile this driver as a module, choose M here: the module

	  will be called intel_chtdc_ti_pwrbtn.



config INTEL_CHTWC_INT33FE

	tristate "Intel Cherry Trail Whiskey Cove 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 Intel Cherry Trail Whiskey Cove

	  INT33FE ACPI device found on the GPD win and the GPD pocket.



	  The INT33FE ACPI device on these mini laptops contains I2cSerialBusV2

	  resources for a MAX17042 Fuel Gauge, 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_TYPEC_FUSB302=m, CONFIG_TYPEC_MUX_PI3USB30532=m and

	  CONFIG_BATTERY_MAX17042=m.



config INTEL_ISHTP_ECLITE

	tristate "Intel ISHTP eclite controller Driver"

	depends on INTEL_ISH_HID

drivers/platform/x86/intel/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 


obj-$(CONFIG_INTEL_ATOMISP2_PDX86)	+= atomisp2/

obj-$(CONFIG_INTEL_SAR_INT1092)		+= int1092/

obj-$(CONFIG_INTEL_CHT_INT33FE)		+= int33fe/

obj-$(CONFIG_INTEL_SKL_INT3472)		+= int3472/

obj-$(CONFIG_INTEL_PMC_CORE)		+= pmc/

obj-$(CONFIG_INTEL_PMT_CLASS)		+= pmt/
@@ -36,6 +35,8 @@ intel_crystal_cove_charger-y := crystal_cove_charger.o 
obj-$(CONFIG_X86_ANDROID_TABLETS)	+= intel_crystal_cove_charger.o

intel_chtdc_ti_pwrbtn-y			:= chtdc_ti_pwrbtn.o

obj-$(CONFIG_INTEL_CHTDC_TI_PWRBTN)	+= intel_chtdc_ti_pwrbtn.o

intel_chtwc_int33fe-y			:= chtwc_int33fe.o

obj-$(CONFIG_INTEL_CHTWC_INT33FE)	+= intel_chtwc_int33fe.o

intel_mrfld_pwrbtn-y			:= mrfld_pwrbtn.o

obj-$(CONFIG_INTEL_MRFLD_PWRBTN)	+= intel_mrfld_pwrbtn.o

intel_punit_ipc-y			:= punit_ipc.o

drivers/platform/x86/intel/int33fe/Kconfig

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
# 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 the

	  GPD win and the GPD pocket.



	  The INT33FE ACPI device on these mini laptops contains I2cSerialBusV2

	  resources for a MAX17042 Fuel Gauge, 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_TYPEC_FUSB302=m, CONFIG_TYPEC_MUX_PI3USB30532=m and

	  CONFIG_BATTERY_MAX17042=m.

drivers/platform/x86/intel/int33fe/Makefile

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

obj-$(CONFIG_INTEL_CHT_INT33FE) += intel_cht_int33fe_typec.o