Skip to content

Commit a2fe7ba

Browse files
tretterbebarino
authored andcommitted
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 <[email protected]> Acked-by: Michal Simek <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Stephen Boyd <[email protected]>
1 parent cd0cefa commit a2fe7ba

File tree

7 files changed

+23
-18
lines changed

7 files changed

+23
-18
lines changed

drivers/clk/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,7 @@ source "drivers/clk/tegra/Kconfig"
393393
source "drivers/clk/ti/Kconfig"
394394
source "drivers/clk/uniphier/Kconfig"
395395
source "drivers/clk/x86/Kconfig"
396+
source "drivers/clk/xilinx/Kconfig"
396397
source "drivers/clk/zynqmp/Kconfig"
397398

398399
endif

drivers/clk/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ obj-y += versatile/
122122
ifeq ($(CONFIG_COMMON_CLK), y)
123123
obj-$(CONFIG_X86) += x86/
124124
endif
125+
obj-y += xilinx/
125126
obj-$(CONFIG_ARCH_ZX) += zte/
126127
obj-$(CONFIG_ARCH_ZYNQ) += zynq/
127128
obj-$(CONFIG_COMMON_CLK_ZYNQMP) += zynqmp/

drivers/clk/xilinx/Kconfig

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+

drivers/clk/xilinx/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
obj-$(CONFIG_XILINX_VCU) += xlnx_vcu.o
File renamed without changes.

drivers/soc/xilinx/Kconfig

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0
22
menu "Xilinx SoC drivers"
33

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-
214
config ZYNQMP_POWER
225
bool "Enable Xilinx Zynq MPSoC Power Management driver"
236
depends on PM && ZYNQMP_FIRMWARE

drivers/soc/xilinx/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
# SPDX-License-Identifier: GPL-2.0
2-
obj-$(CONFIG_XILINX_VCU) += xlnx_vcu.o
32
obj-$(CONFIG_ZYNQMP_POWER) += zynqmp_power.o
43
obj-$(CONFIG_ZYNQMP_PM_DOMAINS) += zynqmp_pm_domains.o

0 commit comments

Comments
 (0)