Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Michael Tretter and committed by
Stephen Boyd
a2fe7baa cd0cefa9

+23 -18
+1
drivers/clk/Kconfig
··· 393 393 source "drivers/clk/ti/Kconfig" 394 394 source "drivers/clk/uniphier/Kconfig" 395 395 source "drivers/clk/x86/Kconfig" 396 + source "drivers/clk/xilinx/Kconfig" 396 397 source "drivers/clk/zynqmp/Kconfig" 397 398 398 399 endif
+1
drivers/clk/Makefile
··· 122 122 ifeq ($(CONFIG_COMMON_CLK), y) 123 123 obj-$(CONFIG_X86) += x86/ 124 124 endif 125 + obj-y += xilinx/ 125 126 obj-$(CONFIG_ARCH_ZX) += zte/ 126 127 obj-$(CONFIG_ARCH_ZYNQ) += zynq/ 127 128 obj-$(CONFIG_COMMON_CLK_ZYNQMP) += zynqmp/
+19
drivers/clk/xilinx/Kconfig
··· 1 + # SPDX-License-Identifier: GPL-2.0 2 + 3 + config XILINX_VCU 4 + tristate "Xilinx VCU logicoreIP Init" 5 + depends on HAS_IOMEM && COMMON_CLK 6 + select REGMAP_MMIO 7 + help 8 + Provides the driver to enable and disable the isolation between the 9 + processing system and programmable logic part by using the logicoreIP 10 + register set. This driver also configures the frequency based on the 11 + clock information from the logicoreIP register set. 12 + 13 + If you say yes here you get support for the logicoreIP. 14 + 15 + If unsure, say N. 16 + 17 + To compile this driver as a module, choose M here: the 18 + module will be called xlnx_vcu. 19 +
+2
drivers/clk/xilinx/Makefile
··· 1 + # SPDX-License-Identifier: GPL-2.0 2 + obj-$(CONFIG_XILINX_VCU) += xlnx_vcu.o
-17
drivers/soc/xilinx/Kconfig
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 2 menu "Xilinx SoC drivers" 3 3 4 - config XILINX_VCU 5 - tristate "Xilinx VCU logicoreIP Init" 6 - depends on HAS_IOMEM && COMMON_CLK 7 - select REGMAP_MMIO 8 - help 9 - Provides the driver to enable and disable the isolation between the 10 - processing system and programmable logic part by using the logicoreIP 11 - register set. This driver also configures the frequency based on the 12 - clock information from the logicoreIP register set. 13 - 14 - If you say yes here you get support for the logicoreIP. 15 - 16 - If unsure, say N. 17 - 18 - To compile this driver as a module, choose M here: the 19 - module will be called xlnx_vcu. 20 - 21 4 config ZYNQMP_POWER 22 5 bool "Enable Xilinx Zynq MPSoC Power Management driver" 23 6 depends on PM && ZYNQMP_FIRMWARE
-1
drivers/soc/xilinx/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 - obj-$(CONFIG_XILINX_VCU) += xlnx_vcu.o 3 2 obj-$(CONFIG_ZYNQMP_POWER) += zynqmp_power.o 4 3 obj-$(CONFIG_ZYNQMP_PM_DOMAINS) += zynqmp_pm_domains.o
drivers/soc/xilinx/xlnx_vcu.c drivers/clk/xilinx/xlnx_vcu.c