platform-driver-x86.vger.kernel.org archive mirror
 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 v3 18/20] platform/x86: intel-vbtn: Move to intel sub-directory
Date: Thu, 19 Aug 2021 11:29:59 +0800	[thread overview]
Message-ID: <20210819033001.20136-19-hpa@redhat.com> (raw)
In-Reply-To: <20210819033001.20136-1-hpa@redhat.com>

Move intel-vbtn to intel sub-directory to improve
readability.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
---
 drivers/platform/x86/Kconfig                        | 13 -------------
 drivers/platform/x86/Makefile                       |  3 +--
 drivers/platform/x86/intel/Kconfig                  | 13 +++++++++++++
 drivers/platform/x86/intel/Makefile                 |  2 ++
 drivers/platform/x86/{intel-vbtn.c => intel/vbtn.c} |  2 +-
 5 files changed, 17 insertions(+), 16 deletions(-)
 rename drivers/platform/x86/{intel-vbtn.c => intel/vbtn.c} (99%)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 6ed05e5faac1..b8ce4e6d90dd 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -667,19 +667,6 @@ config THINKPAD_LMI
 
 source "drivers/platform/x86/intel/Kconfig"
 
-config INTEL_VBTN
-	tristate "INTEL VIRTUAL BUTTON"
-	depends on ACPI
-	depends on INPUT
-	depends on I2C
-	select INPUT_SPARSEKMAP
-	help
-	  This driver provides support for the Intel Virtual Button interface.
-	  Some laptops require this driver for power button support.
-
-	  To compile this driver as a module, choose M here: the module will
-	  be called intel_vbtn.
-
 config MSI_LAPTOP
 	tristate "MSI Laptop Extras"
 	depends on ACPI
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index afeea9ce34b8..d8b193e910bd 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -69,11 +69,10 @@ obj-$(CONFIG_IDEAPAD_LAPTOP)	+= ideapad-laptop.o
 obj-$(CONFIG_SENSORS_HDAPS)	+= hdaps.o
 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_VBTN)		+= intel-vbtn.o
-
 # MSI
 obj-$(CONFIG_MSI_LAPTOP)	+= msi-laptop.o
 obj-$(CONFIG_MSI_WMI)		+= msi-wmi.o
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index 5ca3c36ac187..3a13f7a6da4d 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -53,6 +53,19 @@ config INTEL_INT0002_VGPIO
          To compile this driver as a module, choose M here: the module will
          be called intel_int0002_vgpio.
 
+config INTEL_VBTN
+       tristate "INTEL VIRTUAL BUTTON"
+       depends on ACPI
+       depends on INPUT
+       depends on I2C
+       select INPUT_SPARSEKMAP
+       help
+         This driver provides support for the Intel Virtual Button interface.
+         Some laptops require this driver for power button support.
+
+         To compile this driver as a module, choose M here: the module will
+         be called intel_vbtn.
+
 config INTEL_OAKTRAIL
         tristate "Intel Oaktrail Platform Extras"
         depends on ACPI
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index da238e2e352d..4211c683315f 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -15,6 +15,8 @@ intel_int0002_vgpio-y			:= int0002_vgpio.o
 obj-$(CONFIG_INTEL_INT0002_VGPIO)	+= intel_int0002_vgpio.o
 intel_oaktrail-y			:= oaktrail.o
 obj-$(CONFIG_INTEL_OAKTRAIL)		+= intel_oaktrail.o
+intel-vbtn-y				:= vbtn.o
+obj-$(CONFIG_INTEL_VBTN)		+= intel-vbtn.o
 
 # Intel PMIC / PMC / P-Unit devices
 intel_bxtwc_tmu-y			:= bxtwc_tmu.o
diff --git a/drivers/platform/x86/intel-vbtn.c b/drivers/platform/x86/intel/vbtn.c
similarity index 99%
rename from drivers/platform/x86/intel-vbtn.c
rename to drivers/platform/x86/intel/vbtn.c
index 309166431063..15f013af9e62 100644
--- a/drivers/platform/x86/intel-vbtn.c
+++ b/drivers/platform/x86/intel/vbtn.c
@@ -14,7 +14,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/suspend.h>
-#include "dual_accel_detect.h"
+#include "../dual_accel_detect.h"
 
 /* Returned when NOT in tablet mode on some HP Stream x360 11 models */
 #define VGBS_TABLET_MODE_FLAG_ALT	0x10
-- 
2.31.1


  parent reply	other threads:[~2021-08-19  3:32 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-19  3:29 [PATCH v3 00/20] Intel platform driver code movement Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 01/20] platform/x86: intel_bxtwc_tmu: Move to intel sub-directory Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 02/20] platform/x86: intel_chtdc_ti_pwrbtn: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 03/20] platform/x86: intel_mrfld_pwrbtn: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 04/20] platform/x86: intel_punit_ipc: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 05/20] platform/x86: intel_pmc_core: " Kate Hsuan
2021-08-19  8:37   ` Hans de Goede
2021-08-19 12:05   ` Andy Shevchenko
2021-08-19  3:29 ` [PATCH v3 06/20] platform/x86: intel_scu: " Kate Hsuan
2021-08-19  8:48   ` Hans de Goede
2021-08-19 12:08   ` Andy Shevchenko
2021-08-19  3:29 ` [PATCH v3 07/20] platform/x86: intel_telemetry: " Kate Hsuan
2021-08-19 12:11   ` Andy Shevchenko
2021-08-19  3:29 ` [PATCH v3 08/20] platform/x86: intel_ips: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 09/20] platform/x86: intel-rst: " Kate Hsuan
2021-08-19 12:13   ` Andy Shevchenko
2021-08-19  3:29 ` [PATCH v3 10/20] platform/x86: intel-smartconnect: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 11/20] platform/x86: intel_turbo_max_3: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 12/20] platform/x86: intel-uncore-frequency: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 13/20] platform/x86: intel_speed_select_if: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 14/20] platform/x86: intel_atomisp2_led: " Kate Hsuan
2021-08-19  9:08   ` Hans de Goede
2021-08-19  3:29 ` [PATCH v3 15/20] platform/x86: intel-hid: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 16/20] platform/x86: intel_int0002_vgpio: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 17/20] platform/x86: intel_oaktrail: " Kate Hsuan
2021-08-19  3:29 ` Kate Hsuan [this message]
2021-08-19  3:30 ` [PATCH v3 19/20] platform/x86: intel-wmi-sbl-fw-updat: " Kate Hsuan
2021-08-19  3:30 ` [PATCH v3 20/20] platform/x86: intel-wmi-thunderbolt: " Kate Hsuan
2021-08-19  9:29   ` Hans de Goede
2021-08-19 10:47 ` [PATCH v3 00/20] Intel platform driver code movement Hans de Goede
2021-08-19 12:03   ` Andy Shevchenko
2021-08-19 12:14     ` Andy Shevchenko
2021-08-19 12:46       ` Andy Shevchenko
2021-08-19 13:31       ` Hans de Goede
2021-08-19 13:34         ` Hans de Goede
2021-08-19 14:01           ` Andy Shevchenko
2021-08-19 14:08             ` Hans de Goede

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=20210819033001.20136-19-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 \
    --subject='Re: [PATCH v3 18/20] platform/x86: intel-vbtn: Move to intel sub-directory' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).