platform/x86: Move AMD platform drivers to separate directory

Currently, AMD supported platform drivers are grouped under generic "x86"
folder structure. Move the current drivers (amd-pmc and amd_hsmp) to a
separate directory. This would also mean the newer driver submissions to
pdx86 subsystem in the future will also land in AMD specific directory.

Reviewed-by: Naveen Krishna Chatradhi <NaveenKrishna.Chatradhi@amd.com>
Tested-by: Suma Hegde <suma.hegde@amd.com>
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
Link: https://lore.kernel.org/r/20220608193212.2827257-1-Shyam-sundar.S-k@amd.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index a6d3bd9d2a8d0f3ae88339e8335015eac73cfab1..2a34deb245943748d3999a639fea2d5ceee18354 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -996,7 +996,7 @@ AMD PMC DRIVER
 M:     Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
 L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
-F:     drivers/platform/x86/amd-pmc.*
+F:     drivers/platform/x86/amd/pmc.c
 
 AMD HSMP DRIVER
 M:     Naveen Krishna Chatradhi <naveenkrishna.chatradhi@amd.com>
@@ -1006,7 +1006,7 @@ S:        Maintained
 F:     Documentation/x86/amd_hsmp.rst
 F:     arch/x86/include/asm/amd_hsmp.h
 F:     arch/x86/include/uapi/asm/amd_hsmp.h
-F:     drivers/platform/x86/amd_hsmp.c
+F:     drivers/platform/x86/amd/hsmp.c
 
 AMD POWERPLAY AND SWSMU
 M:     Evan Quan <evan.quan@amd.com>

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 85c396a430484b40afd2a7234e61b384920d6109..e7f10287a894f16d8fb3887ce3ff4422f3ab82bf 100644 (file)
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -196,32 +196,7 @@ config ACER_WMI
          If you have an ACPI-WMI compatible Acer/ Wistron laptop, say Y or M
          here.
 
-config AMD_PMC
-       tristate "AMD SoC PMC driver"
-       depends on ACPI && PCI && RTC_CLASS
-       help
-         The driver provides support for AMD Power Management Controller
-         primarily responsible for S2Idle transactions that are driven from
-         a platform firmware running on SMU. This driver also provides a debug
-         mechanism to investigate the S2Idle transactions and failures.
-
-         Say Y or M here if you have a notebook powered by AMD RYZEN CPU/APU.
-
-         If you choose to compile this driver as a module the module will be
-         called amd-pmc.
-
-config AMD_HSMP
-       tristate "AMD HSMP Driver"
-       depends on AMD_NB && X86_64
-       help
-         The driver provides a way for user space tools to monitor and manage
-         system management functionality on EPYC server CPUs from AMD.
-
-         Host System Management Port (HSMP) interface is a mailbox interface
-         between the x86 core and the System Management Unit (SMU) firmware.
-
-         If you choose to compile this driver as a module the module will be
-         called amd_hsmp.
+source "drivers/platform/x86/amd/Kconfig"
 
 config ADV_SWBUTTON
        tristate "Advantech ACPI Software Button Driver"

diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index cc2a747133131a401143924964ea10bdd6b4e58d..a0e417c34a9bf58092ab169792d81196de252f3d 100644 (file)
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -23,8 +23,7 @@ obj-$(CONFIG_ACER_WIRELESS)   += acer-wireless.o
 obj-$(CONFIG_ACER_WMI)         += acer-wmi.o
 
 # AMD
-obj-$(CONFIG_AMD_PMC)          += amd-pmc.o
-obj-$(CONFIG_AMD_HSMP)         += amd_hsmp.o
+obj-y                          += amd/
 
 # Advantech
 obj-$(CONFIG_ADV_SWBUTTON)     += adv_swbutton.o

diff --git a/drivers/platform/x86/amd/Kconfig b/drivers/platform/x86/amd/Kconfig
new file mode 100644 (file)
index 0000000..c0d0a3c
--- /dev/null
+++ b/drivers/platform/x86/amd/Kconfig
@@ -0,0 +1,31 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# AMD x86 Platform Specific Drivers
+#
+
+config AMD_PMC
+       tristate "AMD SoC PMC driver"
+       depends on ACPI && PCI && RTC_CLASS
+       help
+         The driver provides support for AMD Power Management Controller
+         primarily responsible for S2Idle transactions that are driven from
+         a platform firmware running on SMU. This driver also provides a debug
+         mechanism to investigate the S2Idle transactions and failures.
+
+         Say Y or M here if you have a notebook powered by AMD RYZEN CPU/APU.
+
+         If you choose to compile this driver as a module the module will be
+         called amd-pmc.
+
+config AMD_HSMP
+       tristate "AMD HSMP Driver"
+       depends on AMD_NB && X86_64
+       help
+         The driver provides a way for user space tools to monitor and manage
+         system management functionality on EPYC server CPUs from AMD.
+
+         Host System Management Port (HSMP) interface is a mailbox interface
+         between the x86 core and the System Management Unit (SMU) firmware.
+
+         If you choose to compile this driver as a module the module will be
+         called amd_hsmp.

diff --git a/drivers/platform/x86/amd/Makefile b/drivers/platform/x86/amd/Makefile
new file mode 100644 (file)
index 0000000..a03fbb0
--- /dev/null
+++ b/drivers/platform/x86/amd/Makefile
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Makefile for drivers/platform/x86/amd
+# AMD x86 Platform-Specific Drivers
+#
+
+amd-pmc-y                      := pmc.o
+obj-$(CONFIG_AMD_PMC)          += amd-pmc.o
+amd_hsmp-y                     := hsmp.o
+obj-$(CONFIG_AMD_HSMP)         += amd_hsmp.o

diff --git a/drivers/platform/x86/amd_hsmp.c b/drivers/platform/x86/amd/hsmp.c
similarity index 100%
rename from drivers/platform/x86/amd_hsmp.c
rename to drivers/platform/x86/amd/hsmp.c

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