All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kate Hsuan <hpa@redhat.com>
To: Alex Hung <alex.hung@canonical.com>,
	Hans de Goede <hdegoede@redhat.com>,
	Mark Gross <mgross@linux.intel.com>,
	Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>,
	AceLan Kao <acelan.kao@canonical.com>,
	Jithu Joseph <jithu.joseph@intel.com>,
	Maurice Ma <maurice.ma@intel.com>,
	Sujith Thomas <sujith.thomas@intel.com>,
	Rajneesh Bhardwaj <irenic.rajneesh@gmail.com>,
	Zha Qipeng <qipeng.zha@intel.com>,
	Mika Westerberg <mika.westerberg@linux.intel.com>,
	"David E . Box" <david.e.box@linux.intel.com>,
	linux-kernel@vger.kernel.org, Dell.Client.Kernel@dell.com
Cc: platform-driver-x86@vger.kernel.org, Kate Hsuan <hpa@redhat.com>
Subject: [PATCH v2 03/20] platform/x86: intel_mrfld_pwrbtn: Move to intel sub-directory
Date: Mon, 16 Aug 2021 18:51:02 +0800	[thread overview]
Message-ID: <20210816105119.704302-4-hpa@redhat.com> (raw)
In-Reply-To: <20210816105119.704302-1-hpa@redhat.com>

Move intel_mrfld_pwrbtn to intel sub-directory
to improve readability.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
---
 drivers/platform/x86/Kconfig                          | 11 -----------
 drivers/platform/x86/Makefile                         |  1 -
 drivers/platform/x86/intel/Kconfig                    | 11 +++++++++++
 drivers/platform/x86/intel/Makefile                   |  2 ++
 .../{intel_mrfld_pwrbtn.c => intel/mrfld_pwrbtn.c}    |  0
 5 files changed, 13 insertions(+), 12 deletions(-)
 rename drivers/platform/x86/{intel_mrfld_pwrbtn.c => intel/mrfld_pwrbtn.c} (100%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 0b49cb62514a..66cc8a8a9bae 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1168,17 +1168,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
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 683e3abaa8e6..fb6dc4d9e8df 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -129,7 +129,6 @@ 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
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 0a3ca61db14f..c4f7518d747b 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -41,4 +41,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
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index e0bbb855e08b..d194327565fe 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -13,3 +13,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
diff --git a/drivers/platform/x86/intel_mrfld_pwrbtn.c b/drivers/platform/x86/intel/mrfld_pwrbtn.c
similarity index 100%
rename from drivers/platform/x86/intel_mrfld_pwrbtn.c
rename to drivers/platform/x86/intel/mrfld_pwrbtn.c
-- 
2.31.1


  parent reply	other threads:[~2021-08-16 10:53 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-16 10:50 [PATCH v2 00/20] Intel platform driver code movement Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 01/20] platform/x86: intel_bxtwc_tmu: Move to intel sub-directory Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 02/20] platform/x86: intel_chtdc_ti_pwrbtn: " Kate Hsuan
2021-08-16 10:51 ` Kate Hsuan [this message]
2021-08-16 10:51 ` [PATCH v2 04/20] platform/x86: intel_punit_ipc: " Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 05/20] platform/x86: intel_pmc_core: " Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 06/20] platform/x86: intel_scu: " Kate Hsuan
2021-08-16 18:03   ` kernel test robot
2021-08-17  9:15   ` Mika Westerberg
2021-08-17 12:30     ` Kate Hsuan
2021-08-17 12:23   ` kernel test robot
2021-08-17 14:26     ` Hans de Goede
2021-08-17 17:50   ` kernel test robot
2021-08-16 10:51 ` [PATCH v2 07/20] platform/x86: intel_telemetry: " Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 08/20] platform/x86: intel_ips: " Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 09/20] platform/x86: intel-rst: " Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 10/20] platform/x86: intel-smartconnect: " Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 11/20] platform/x86: intel_turbo_max_3: " Kate Hsuan
2021-08-16 14:51   ` Pandruvada, Srinivas
2021-08-17  1:44     ` Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 12/20] platform/x86: intel-uncore-frequency: " Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 13/20] platform/x86: intel_speed_select_if: " Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 14/20] platform/x86: intel_atomisp2_led: " Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 15/20] platform/x86: intel-hid: " Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 16/20] platform/x86: intel_int0002_vgpio: " Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 17/20] platform/x86: intel_oaktrail.c: " Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 18/20] platform/x86: intel-vbtn: " Kate Hsuan
2021-08-16 17:33   ` kernel test robot
2021-08-16 10:51 ` [PATCH v2 19/20] platform/x86: intel-wmi-sbl-fw-updat: " Kate Hsuan
2021-08-16 10:51 ` [PATCH v2 20/20] platform/x86: intel-wmi-thunderbolt: " Kate Hsuan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210816105119.704302-4-hpa@redhat.com \
    --to=hpa@redhat.com \
    --cc=Dell.Client.Kernel@dell.com \
    --cc=acelan.kao@canonical.com \
    --cc=alex.hung@canonical.com \
    --cc=david.e.box@linux.intel.com \
    --cc=hdegoede@redhat.com \
    --cc=irenic.rajneesh@gmail.com \
    --cc=jithu.joseph@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maurice.ma@intel.com \
    --cc=mgross@linux.intel.com \
    --cc=mika.westerberg@linux.intel.com \
    --cc=platform-driver-x86@vger.kernel.org \
    --cc=qipeng.zha@intel.com \
    --cc=srinivas.pandruvada@linux.intel.com \
    --cc=sujith.thomas@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.