platform/x86: Move existing HP drivers to a new hp subdir

[ Upstream commit 6e9b8992b122cb12688bd259fc99e67d1be234eb ]

The purpose of this patch is to provide a central location where all
HP related drivers are found. HP drivers will recide under
drivers/platform/x86/hp directory.

Introduce changes to Kconfig file to list all HP driver under "HP X86
Platform Specific Device Drivers" menu option. Additional changes
include update MAINTAINERS file to indicate hp related drivers new
path.

Signed-off-by: Jorge Lopez <jorge.lopez2@hp.com>
Link: https://lore.kernel.org/r/20221020201033.12790-2-jorge.lopez2@hp.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Stable-dep-of: decab2825c3e ("platform/x86: hp-wmi: add micmute to hp_wmi_keymap struct")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 2d3d2155c744df4c96c64644cef86349f73c1a8c..95374d582574f685dc3841784c269a950868dae6 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8568,7 +8568,7 @@ F:        drivers/net/wireless/intersil/hostap/
 HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER
 L:     platform-driver-x86@vger.kernel.org
 S:     Orphan
-F:     drivers/platform/x86/tc1100-wmi.c
+F:     drivers/platform/x86/hp/tc1100-wmi.c
 
 HPET:  High Precision Event Timers driver
 M:     Clemens Ladisch <clemens@ladisch.de>
@@ -10838,7 +10838,7 @@ M:      Eric Piel <eric.piel@tremplin-utc.net>
 S:     Maintained
 F:     Documentation/misc-devices/lis3lv02d.rst
 F:     drivers/misc/lis3lv02d/
-F:     drivers/platform/x86/hp_accel.c
+F:     drivers/platform/x86/hp/hp_accel.c
 
 LIST KUNIT TEST
 M:     David Gow <davidgow@google.com>

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 61186829d1f6bcb2c0e93b1d0420f77ab7a77c3a..50abcf0c483c31b9b346276a13ba35a7b880c0d2 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -389,24 +389,7 @@ config GPD_POCKET_FAN
          of the CPU temperature. Say Y or M if the kernel may be used on a
          GPD pocket.
 
-config HP_ACCEL
-       tristate "HP laptop accelerometer"
-       depends on INPUT && ACPI
-       depends on SERIO_I8042
-       select SENSORS_LIS3LV02D
-       select NEW_LEDS
-       select LEDS_CLASS
-       help
-         This driver provides support for the "Mobile Data Protection System 3D"
-         or "3D DriveGuard" feature of HP laptops. On such systems the driver
-         should load automatically (via ACPI alias).
-
-         Support for a led indicating disk protection will be provided as
-         hp::hddprotect. For more information on the feature, refer to
-         Documentation/misc-devices/lis3lv02d.rst.
-
-         To compile this driver as a module, choose M here: the module will
-         be called hp_accel.
+source "drivers/platform/x86/hp/Kconfig"
 
 config WIRELESS_HOTKEY
        tristate "Wireless hotkey button"
@@ -420,29 +403,6 @@ config WIRELESS_HOTKEY
         To compile this driver as a module, choose M here: the module will
         be called wireless-hotkey.
 
-config HP_WMI
-       tristate "HP WMI extras"
-       depends on ACPI_WMI
-       depends on INPUT
-       depends on RFKILL || RFKILL = n
-       select INPUT_SPARSEKMAP
-       select ACPI_PLATFORM_PROFILE
-       help
-        Say Y here if you want to support WMI-based hotkeys on HP laptops and
-        to read data from WMI such as docking or ambient light sensor state.
-
-        To compile this driver as a module, choose M here: the module will
-        be called hp-wmi.
-
-config TC1100_WMI
-       tristate "HP Compaq TC1100 Tablet WMI Extras"
-       depends on !X86_64
-       depends on ACPI
-       depends on ACPI_WMI
-       help
-         This is a driver for the WMI extensions (wireless and bluetooth power
-         control) of the HP Compaq TC1100 tablet.
-
 config IBM_RTL
        tristate "Device driver to enable PRTL support"
        depends on PCI

diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 2734a771d1f00140a785e3b00a45aa43a5d4f141..5dba9fe23fb15392318efe2838bd85d00b5e788d 100644 (file)
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -52,9 +52,7 @@ obj-$(CONFIG_FUJITSU_TABLET)  += fujitsu-tablet.o
 obj-$(CONFIG_GPD_POCKET_FAN)   += gpd-pocket-fan.o
 
 # Hewlett Packard
-obj-$(CONFIG_HP_ACCEL)         += hp_accel.o
-obj-$(CONFIG_HP_WMI)           += hp-wmi.o
-obj-$(CONFIG_TC1100_WMI)       += tc1100-wmi.o
+obj-$(CONFIG_X86_PLATFORM_DRIVERS_HP)  += hp/
 
 # Hewlett Packard Enterprise
 obj-$(CONFIG_UV_SYSFS)       += uv_sysfs.o

diff --git a/drivers/platform/x86/hp/Kconfig b/drivers/platform/x86/hp/Kconfig
new file mode 100644 (file)
index 0000000..ae16595
--- /dev/null
+++ b/drivers/platform/x86/hp/Kconfig
@@ -0,0 +1,63 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# X86 Platform Specific Drivers
+#
+menuconfig X86_PLATFORM_DRIVERS_HP
+       bool "HP X86 Platform Specific Device Drivers"
+       depends on X86_PLATFORM_DEVICES
+       help
+         Say Y here to get to see options for device drivers for various
+         HP x86 platforms, including vendor-specific laptop extension drivers.
+         This option alone does not add any kernel code.
+
+         If you say N, all options in this submenu will be skipped and disabled.
+
+if X86_PLATFORM_DRIVERS_HP
+
+config HP_ACCEL
+       tristate "HP laptop accelerometer"
+       default m
+       depends on INPUT && ACPI
+       depends on SERIO_I8042
+       select SENSORS_LIS3LV02D
+       select NEW_LEDS
+       select LEDS_CLASS
+       help
+         This driver provides support for the "Mobile Data Protection System 3D"
+         or "3D DriveGuard" feature of HP laptops. On such systems the driver
+         should load automatically (via ACPI alias).
+
+         Support for a led indicating disk protection will be provided as
+         hp::hddprotect. For more information on the feature, refer to
+         Documentation/misc-devices/lis3lv02d.rst.
+
+         To compile this driver as a module, choose M here: the module will
+         be called hp_accel.
+
+config HP_WMI
+       tristate "HP WMI extras"
+       default m
+       depends on ACPI_WMI
+       depends on INPUT
+       depends on RFKILL || RFKILL = n
+       select INPUT_SPARSEKMAP
+       select ACPI_PLATFORM_PROFILE
+       select HWMON
+       help
+         Say Y here if you want to support WMI-based hotkeys on HP laptops and
+         to read data from WMI such as docking or ambient light sensor state.
+
+         To compile this driver as a module, choose M here: the module will
+         be called hp-wmi.
+
+config TC1100_WMI
+       tristate "HP Compaq TC1100 Tablet WMI Extras"
+       default m
+       depends on !X86_64
+       depends on ACPI
+       depends on ACPI_WMI
+       help
+         This is a driver for the WMI extensions (wireless and bluetooth power
+         control) of the HP Compaq TC1100 tablet.
+
+endif # X86_PLATFORM_DRIVERS_HP

diff --git a/drivers/platform/x86/hp/Makefile b/drivers/platform/x86/hp/Makefile
new file mode 100644 (file)
index 0000000..db1eed4
--- /dev/null
+++ b/drivers/platform/x86/hp/Makefile
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Makefile for linux/drivers/platform/x86/hp
+# HP x86 Platform-Specific Drivers
+#
+
+# Hewlett Packard
+obj-$(CONFIG_HP_ACCEL)         += hp_accel.o
+obj-$(CONFIG_HP_WMI)           += hp-wmi.o
+obj-$(CONFIG_TC1100_WMI)       += tc1100-wmi.o

diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp/hp-wmi.c
similarity index 100%
rename from drivers/platform/x86/hp-wmi.c
rename to drivers/platform/x86/hp/hp-wmi.c

diff --git a/drivers/platform/x86/hp_accel.c b/drivers/platform/x86/hp/hp_accel.c
similarity index 99%
rename from drivers/platform/x86/hp_accel.c
rename to drivers/platform/x86/hp/hp_accel.c
index ef24f53753c6ecbb25cdfd17e6a694b714ecbf86..62a1d934647504e7b0519f346070bc7429429f29 100644 (file)
--- a/drivers/platform/x86/hp_accel.c
+++ b/drivers/platform/x86/hp/hp_accel.c
@@ -26,7 +26,7 @@
 #include <linux/acpi.h>
 #include <linux/i8042.h>
 #include <linux/serio.h>
-#include "../../misc/lis3lv02d/lis3lv02d.h"
+#include "../../../misc/lis3lv02d/lis3lv02d.h"
 
 /* Delayed LEDs infrastructure ------------------------------------ */
 

diff --git a/drivers/platform/x86/tc1100-wmi.c b/drivers/platform/x86/hp/tc1100-wmi.c
similarity index 100%
rename from drivers/platform/x86/tc1100-wmi.c
rename to drivers/platform/x86/hp/tc1100-wmi.c