PM: AVS: rockchip-io: Move the driver to the rockchip specific drivers

The avs drivers are all SoC specific drivers that doesn't share any code.
Instead they are located in a directory, mostly to keep similar
functionality together. From a maintenance point of view, it makes better
sense to collect SoC specific drivers like these, into the SoC specific
directories.

Therefore, let's move the rockchip-io driver to the rockchip directory.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/power/avs/Kconfig b/drivers/power/avs/Kconfig
index cdb4237bfd02e58e1f3a26d4a852119825ec4296..e31215680771301f48bbc61f0a29d5876cf032e8 100644 (file)
--- a/drivers/power/avs/Kconfig
+++ b/drivers/power/avs/Kconfig
@@ -27,11 +27,3 @@ config QCOM_CPR
 
          To compile this driver as a module, choose M here: the module will
          be called qcom-cpr
-
-config ROCKCHIP_IODOMAIN
-       tristate "Rockchip IO domain support"
-       depends on POWER_AVS && ARCH_ROCKCHIP && OF
-       help
-         Say y here to enable support io domains on Rockchip SoCs. It is
-         necessary for the io domain setting of the SoC to match the
-         voltage supplied by the regulators.

diff --git a/drivers/power/avs/Makefile b/drivers/power/avs/Makefile
index 9007d05853e2a9c5ba2f0c5c5a06bb3918cb96ed..d611a465cd4204769153b6a5e8def744401252e5 100644 (file)
--- a/drivers/power/avs/Makefile
+++ b/drivers/power/avs/Makefile
@@ -1,4 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_POWER_AVS_OMAP)           += smartreflex.o
 obj-$(CONFIG_QCOM_CPR)                 += qcom-cpr.o
-obj-$(CONFIG_ROCKCHIP_IODOMAIN)                += rockchip-io-domain.o

diff --git a/drivers/soc/rockchip/Kconfig b/drivers/soc/rockchip/Kconfig
index b71b73bf5fc5c53413b35b6d5376314155986f5f..2c13bf4dd5dbee76a294c9c87373d6fa034866da 100644 (file)
--- a/drivers/soc/rockchip/Kconfig
+++ b/drivers/soc/rockchip/Kconfig
@@ -14,6 +14,14 @@ config ROCKCHIP_GRF
          In a lot of cases there also need to be default settings initialized
          to make some of them conform to expectations of the kernel.
 
+config ROCKCHIP_IODOMAIN
+       tristate "Rockchip IO domain support"
+       depends on OF
+       help
+         Say y here to enable support io domains on Rockchip SoCs. It is
+         necessary for the io domain setting of the SoC to match the
+         voltage supplied by the regulators.
+
 config ROCKCHIP_PM_DOMAINS
         bool "Rockchip generic power domain"
         depends on PM

diff --git a/drivers/soc/rockchip/Makefile b/drivers/soc/rockchip/Makefile
index afca0a4c4b7285809514c3880f29b10e5b3c73fc..875032f7344ea9502274d7e4ade7a35f8a0be83e 100644 (file)
--- a/drivers/soc/rockchip/Makefile
+++ b/drivers/soc/rockchip/Makefile
@@ -3,4 +3,5 @@
 # Rockchip Soc drivers
 #
 obj-$(CONFIG_ROCKCHIP_GRF) += grf.o
+obj-$(CONFIG_ROCKCHIP_IODOMAIN) += io-domain.o
 obj-$(CONFIG_ROCKCHIP_PM_DOMAINS) += pm_domains.o

diff --git a/drivers/power/avs/rockchip-io-domain.c b/drivers/soc/rockchip/io-domain.c
similarity index 100%
rename from drivers/power/avs/rockchip-io-domain.c
rename to drivers/soc/rockchip/io-domain.c