Skip to content

Commit c822490

Browse files
Shubhrajyoti Dattabebarino
authored andcommitted
clk: clocking-wizard: Move clocking-wizard out
Add clocking wizard driver to clk. And delete the driver from the staging as it is in drivers/clk. Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com> Link: https://lore.kernel.org/r/20220411100443.15132-3-shubhrajyoti.datta@xilinx.com Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
1 parent 35dbdca commit c822490

File tree

9 files changed

+14
-59
lines changed

9 files changed

+14
-59
lines changed

drivers/clk/xilinx/Kconfig

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,14 @@ config XILINX_VCU
1717
To compile this driver as a module, choose M here: the
1818
module will be called xlnx_vcu.
1919

20+
config COMMON_CLK_XLNX_CLKWZRD
21+
tristate "Xilinx Clocking Wizard"
22+
depends on COMMON_CLK && OF
23+
help
24+
Support for the Xilinx Clocking Wizard IP core clock generator.
25+
Adds support for clocking wizard and compatible.
26+
This driver supports the Xilinx clocking wizard programmable clock
27+
synthesizer. The number of output is configurable in the design.
28+
29+
If unsure, say N.
30+

drivers/clk/xilinx/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# SPDX-License-Identifier: GPL-2.0
22
obj-$(CONFIG_XILINX_VCU) += xlnx_vcu.o
3+
obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD) += clk-xlnx-clock-wizard.o

drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c renamed to drivers/clk/xilinx/clk-xlnx-clock-wizard.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
/*
33
* Xilinx 'Clocking Wizard' driver
44
*
5-
* Copyright (C) 2013 - 2014 Xilinx
5+
* Copyright (C) 2013 - 2021 Xilinx
66
*
77
* Sören Brinkmann <soren.brinkmann@xilinx.com>
8+
*
89
*/
910

1011
#include <linux/platform_device.h>

drivers/staging/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ source "drivers/staging/gdm724x/Kconfig"
6262

6363
source "drivers/staging/fwserial/Kconfig"
6464

65-
source "drivers/staging/clocking-wizard/Kconfig"
66-
6765
source "drivers/staging/fbtft/Kconfig"
6866

6967
source "drivers/staging/most/Kconfig"

drivers/staging/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ obj-$(CONFIG_MFD_NVEC) += nvec/
2121
obj-$(CONFIG_STAGING_BOARD) += board/
2222
obj-$(CONFIG_LTE_GDM724X) += gdm724x/
2323
obj-$(CONFIG_FIREWIRE_SERIAL) += fwserial/
24-
obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD) += clocking-wizard/
2524
obj-$(CONFIG_FB_TFT) += fbtft/
2625
obj-$(CONFIG_MOST) += most/
2726
obj-$(CONFIG_KS7010) += ks7010/

drivers/staging/clocking-wizard/Kconfig

Lines changed: 0 additions & 10 deletions
This file was deleted.

drivers/staging/clocking-wizard/Makefile

Lines changed: 0 additions & 2 deletions
This file was deleted.

drivers/staging/clocking-wizard/TODO

Lines changed: 0 additions & 13 deletions
This file was deleted.

drivers/staging/clocking-wizard/dt-binding.txt

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)