clk: xilinx: move xlnx_vcu clock driver from soc

The xlnx_vcu driver is actually a clock controller driver which provides
clocks that can be used by a driver for the encoder/decoder units. There
is no reason to keep this driver in soc. Move the driver to clk.

NOTE: The register mapping actually contains registers for AXI
performance monitoring, but these are not used by the driver.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Link: https://lore.kernel.org/r/20210121071659.1226489-16-m.tretter@pengutronix.de
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index cee1d4e657bccdd7769fdffbbce666ef239add79..7c5dc348c16feb088fa287a3eb1d73dededbc24c 100644 (file)
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -393,6 +393,7 @@ source "drivers/clk/tegra/Kconfig"
 source "drivers/clk/ti/Kconfig"
 source "drivers/clk/uniphier/Kconfig"
 source "drivers/clk/x86/Kconfig"
+source "drivers/clk/xilinx/Kconfig"
 source "drivers/clk/zynqmp/Kconfig"
 
 endif

diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index dbdc590e7de3aca81ef39256b690b11e26dfc760..074e2233f4450324c1702b115e4b737ef4171b37 100644 (file)
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -122,6 +122,7 @@ obj-y                                       += versatile/
 ifeq ($(CONFIG_COMMON_CLK), y)
 obj-$(CONFIG_X86)                      += x86/
 endif
+obj-y                                  += xilinx/
 obj-$(CONFIG_ARCH_ZX)                  += zte/
 obj-$(CONFIG_ARCH_ZYNQ)                        += zynq/
 obj-$(CONFIG_COMMON_CLK_ZYNQMP)         += zynqmp/

diff --git a/drivers/clk/xilinx/Kconfig b/drivers/clk/xilinx/Kconfig
new file mode 100644 (file)
index 0000000..5224114
--- /dev/null
+++ b/drivers/clk/xilinx/Kconfig
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: GPL-2.0
+
+config XILINX_VCU
+       tristate "Xilinx VCU logicoreIP Init"
+       depends on HAS_IOMEM && COMMON_CLK
+       select REGMAP_MMIO
+       help
+         Provides the driver to enable and disable the isolation between the
+         processing system and programmable logic part by using the logicoreIP
+         register set. This driver also configures the frequency based on the
+         clock information from the logicoreIP register set.
+
+         If you say yes here you get support for the logicoreIP.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called xlnx_vcu.
+

diff --git a/drivers/clk/xilinx/Makefile b/drivers/clk/xilinx/Makefile
new file mode 100644 (file)
index 0000000..dee8fd5
--- /dev/null
+++ b/drivers/clk/xilinx/Makefile
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-$(CONFIG_XILINX_VCU)       += xlnx_vcu.o

diff --git a/drivers/soc/xilinx/xlnx_vcu.c b/drivers/clk/xilinx/xlnx_vcu.c
similarity index 100%
rename from drivers/soc/xilinx/xlnx_vcu.c
rename to drivers/clk/xilinx/xlnx_vcu.c

diff --git a/drivers/soc/xilinx/Kconfig b/drivers/soc/xilinx/Kconfig
index 9fe703772e5ac8806e565e7bde4e14a90e39c884..53af9115dc3118efa956238ee6af91ac11f9895c 100644 (file)
--- a/drivers/soc/xilinx/Kconfig
+++ b/drivers/soc/xilinx/Kconfig
@@ -1,23 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 menu "Xilinx SoC drivers"
 
-config XILINX_VCU
-       tristate "Xilinx VCU logicoreIP Init"
-       depends on HAS_IOMEM && COMMON_CLK
-       select REGMAP_MMIO
-       help
-         Provides the driver to enable and disable the isolation between the
-         processing system and programmable logic part by using the logicoreIP
-         register set. This driver also configures the frequency based on the
-         clock information from the logicoreIP register set.
-
-         If you say yes here you get support for the logicoreIP.
-
-         If unsure, say N.
-
-         To compile this driver as a module, choose M here: the
-         module will be called xlnx_vcu.
-
 config ZYNQMP_POWER
        bool "Enable Xilinx Zynq MPSoC Power Management driver"
        depends on PM && ZYNQMP_FIRMWARE

diff --git a/drivers/soc/xilinx/Makefile b/drivers/soc/xilinx/Makefile
index f66bfea5de175ae2b75f6ec43034e9b6fbb6c275..9854e6f6086b5350c1859c0f33b8d9967e819e7e 100644 (file)
--- a/drivers/soc/xilinx/Makefile
+++ b/drivers/soc/xilinx/Makefile
@@ -1,4 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_XILINX_VCU)       += xlnx_vcu.o
 obj-$(CONFIG_ZYNQMP_POWER)     += zynqmp_power.o
 obj-$(CONFIG_ZYNQMP_PM_DOMAINS) += zynqmp_pm_domains.o