platform/x86/amd/pmc: Move PMC driver to separate directory

With latest commits having PMC code spread across multiple files, it would
be easier to maintain them in a separate directory under amd/pmc.

Co-developed-by: Sanket Goswami <Sanket.Goswami@amd.com>
Signed-off-by: Sanket Goswami <Sanket.Goswami@amd.com>
Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
Link: https://lore.kernel.org/r/20230811112116.2279419-2-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 476cb96..f64afbc 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1006,7 +1006,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.c
+F:     drivers/platform/x86/amd/pmc/
 
 AMD PMF DRIVER
 M:     Shyam Sundar S K <Shyam-sundar.S-k@amd.com>

diff --git a/drivers/platform/x86/amd/Kconfig b/drivers/platform/x86/amd/Kconfig
index d9685ae..55f3a2f 100644 (file)
--- a/drivers/platform/x86/amd/Kconfig
+++ b/drivers/platform/x86/amd/Kconfig
@@ -4,21 +4,7 @@
 #
 
 source "drivers/platform/x86/amd/pmf/Kconfig"
-
-config AMD_PMC
-       tristate "AMD SoC PMC driver"
-       depends on ACPI && PCI && RTC_CLASS && AMD_NB
-       select SERIO
-       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.
+source "drivers/platform/x86/amd/pmc/Kconfig"
 
 config AMD_HSMP
        tristate "AMD HSMP Driver"

diff --git a/drivers/platform/x86/amd/Makefile b/drivers/platform/x86/amd/Makefile
index 65732f0..f04932b 100644 (file)
--- a/drivers/platform/x86/amd/Makefile
+++ b/drivers/platform/x86/amd/Makefile
@@ -4,8 +4,7 @@
 # AMD x86 Platform-Specific Drivers
 #
 
-amd-pmc-y                      := pmc.o pmc-quirks.o
-obj-$(CONFIG_AMD_PMC)          += amd-pmc.o
+obj-$(CONFIG_AMD_PMC)          += pmc/
 amd_hsmp-y                     := hsmp.o
 obj-$(CONFIG_AMD_HSMP)         += amd_hsmp.o
 obj-$(CONFIG_AMD_PMF)          += pmf/

diff --git a/drivers/platform/x86/amd/pmc/Kconfig b/drivers/platform/x86/amd/pmc/Kconfig
new file mode 100644 (file)
index 0000000..8db9e82
--- /dev/null
+++ b/drivers/platform/x86/amd/pmc/Kconfig
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# AMD PMC Driver
+#
+
+config AMD_PMC
+       tristate "AMD SoC PMC driver"
+       depends on ACPI && PCI && RTC_CLASS && AMD_NB
+       select SERIO
+       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.

diff --git a/drivers/platform/x86/amd/pmc/Makefile b/drivers/platform/x86/amd/pmc/Makefile
new file mode 100644 (file)
index 0000000..4aaa29d
--- /dev/null
+++ b/drivers/platform/x86/amd/pmc/Makefile
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Makefile for linux/drivers/platform/x86/amd/pmc
+# AMD Power Management Controller Driver
+#
+
+amd-pmc-objs := pmc.o pmc-quirks.o
+obj-$(CONFIG_AMD_PMC) += amd-pmc.o

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

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

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