Commit f51c108d authored by Kate Hsuan's avatar Kate Hsuan Committed by Hans de Goede
Browse files

platform/x86: intel_mrfld_pwrbtn: Move to intel sub-directory 



Move Intel Merrifield power button driver to intel sub-directory
to improve readability.

Signed-off-by: default avatarKate Hsuan <hpa@redhat.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20210820110458.73018-5-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent 2e4355e4

drivers/platform/x86/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -1159,17 +1159,6 @@ config INTEL_UNCORE_FREQ_CONTROL 
	  To compile this driver as a module, choose M here: the module

	  will be called intel-uncore-frequency.



config INTEL_MRFLD_PWRBTN

	tristate "Intel Merrifield Basin Cove power button driver"

	depends on INTEL_SOC_PMIC_MRFLD

	depends on INPUT

	help

	  This option adds a power button driver for Basin Cove PMIC

	  on Intel Merrifield devices.



	  To compile this driver as a module, choose M here: the module

	  will be called intel_mrfld_pwrbtn.



config INTEL_PMC_CORE

	tristate "Intel PMC Core driver"

	depends on PCI

drivers/platform/x86/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ obj-$(CONFIG_INTEL_TURBO_MAX_3) += intel_turbo_max_3.o 
obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL)		+= intel-uncore-frequency.o



# Intel PMIC / PMC / P-Unit devices

obj-$(CONFIG_INTEL_MRFLD_PWRBTN)	+= intel_mrfld_pwrbtn.o

obj-$(CONFIG_INTEL_PMC_CORE)		+= intel_pmc_core.o intel_pmc_core_pltdrv.o

obj-$(CONFIG_INTEL_PUNIT_IPC)		+= intel_punit_ipc.o

obj-$(CONFIG_INTEL_SCU_IPC)		+= intel_scu_ipc.o

drivers/platform/x86/intel/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -42,4 +42,15 @@ 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_MRFLD_PWRBTN

	tristate "Intel Merrifield Basin Cove power button driver"

	depends on INTEL_SOC_PMIC_MRFLD

	depends on INPUT

	help

	  This option adds a power button driver for Basin Cove PMIC

	  on Intel Merrifield devices.



	  To compile this driver as a module, choose M here: the module

	  will be called intel_mrfld_pwrbtn.



endif # X86_PLATFORM_DRIVERS_INTEL

drivers/platform/x86/intel/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -14,3 +14,5 @@ intel_bxtwc_tmu-y := bxtwc_tmu.o 
obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU)	+= intel_bxtwc_tmu.o

intel_chtdc_ti_pwrbtn-y			:= chtdc_ti_pwrbtn.o

obj-$(CONFIG_INTEL_CHTDC_TI_PWRBTN)	+= intel_chtdc_ti_pwrbtn.o

intel_mrfld_pwrbtn-y			:= mrfld_pwrbtn.o

obj-$(CONFIG_INTEL_MRFLD_PWRBTN)	+= intel_mrfld_pwrbtn.o