ARM: ux500: Move power-domain driver to the genpd dir

To simplify with maintenance let's move the ux500 power-domain driver to
the new genpd directory. Going forward, patches are intended to be managed
through a separate git tree, according to MAINTAINERS.

Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 633bc6767cd5186dab371bff39ac62cff43481fa..377f68e66fb4766eec3f0f5ad526e884d5c588f1 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2421,6 +2421,7 @@ F:        arch/arm/mach-ux500/
 F:     drivers/clk/clk-nomadik.c
 F:     drivers/clocksource/clksrc-dbx500-prcmu.c
 F:     drivers/dma/ste_dma40*
+F:     drivers/genpd/st/ste-ux500-pm-domain.c
 F:     drivers/hwspinlock/u8500_hsem.c
 F:     drivers/i2c/busses/i2c-nomadik.c
 F:     drivers/iio/adc/ab8500-gpadc.c

diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile
index 5e903241bded6e51b9b5491e02e3f66dd5aa6496..270e5676fa02a9b9bc218afdd22af6dbbc7a1c1a 100644 (file)
--- a/arch/arm/mach-ux500/Makefile
+++ b/arch/arm/mach-ux500/Makefile
@@ -6,4 +6,3 @@
 obj-y                          := pm.o
 obj-$(CONFIG_UX500_SOC_DB8500) += cpu-db8500.o
 obj-$(CONFIG_SMP)              += platsmp.o
-obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o

diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile
index efd955f586e960e0125cac7abc106616b5881c98..c429485c13f69acd8a8939d662f8b131dcea6978 100644 (file)
--- a/drivers/genpd/Makefile
+++ b/drivers/genpd/Makefile
@@ -8,6 +8,7 @@ obj-y                                   += qcom/
 obj-y                                  += renesas/
 obj-y                                  += rockchip/
 obj-y                                  += samsung/
+obj-y                                  += st/
 obj-y                                  += starfive/
 obj-y                                  += sunxi/
 obj-y                                  += tegra/

diff --git a/drivers/genpd/st/Makefile b/drivers/genpd/st/Makefile
new file mode 100644 (file)
index 0000000..8fa5f98
--- /dev/null
+++ b/drivers/genpd/st/Makefile
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0-only
+obj-$(CONFIG_ARCH_U8500)               += ste-ux500-pm-domain.o

diff --git a/arch/arm/mach-ux500/pm_domains.c b/drivers/genpd/st/ste-ux500-pm-domain.c
similarity index 100%
rename from arch/arm/mach-ux500/pm_domains.c
rename to drivers/genpd/st/ste-ux500-pm-domain.c