Commit c822490f authored by Shubhrajyoti Datta's avatar Shubhrajyoti Datta Committed by Stephen Boyd
Browse files

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: default avatarShubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Link: https://lore.kernel.org/r/20220411100443.15132-3-shubhrajyoti.datta@xilinx.com


Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 35dbdcac

drivers/clk/xilinx/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -17,3 +17,14 @@ config XILINX_VCU 
	  To compile this driver as a module, choose M here: the

	  module will be called xlnx_vcu.



config COMMON_CLK_XLNX_CLKWZRD

	tristate "Xilinx Clocking Wizard"

	depends on COMMON_CLK && OF

	help

	  Support for the Xilinx Clocking Wizard IP core clock generator.

	  Adds support for clocking wizard and compatible.

	  This driver supports the Xilinx clocking wizard programmable clock

	  synthesizer. The number of output is configurable in the design.



	  If unsure, say N.

drivers/clk/xilinx/Makefile

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_XILINX_VCU)	+= xlnx_vcu.o

obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD)	+= clk-xlnx-clock-wizard.o

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

+2 −1
Original line number Diff line number Diff line
@@ -2,9 +2,10 @@ 
/*

 * Xilinx 'Clocking Wizard' driver

 *

 *  Copyright (C) 2013 - 2014 Xilinx

 *  Copyright (C) 2013 - 2021 Xilinx

 *

 *  Sören Brinkmann <soren.brinkmann@xilinx.com>

 *

 */



#include <linux/platform_device.h>

drivers/staging/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -62,8 +62,6 @@ source "drivers/staging/gdm724x/Kconfig" 


source "drivers/staging/fwserial/Kconfig"



source "drivers/staging/clocking-wizard/Kconfig"



source "drivers/staging/fbtft/Kconfig"



source "drivers/staging/most/Kconfig"

drivers/staging/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ obj-$(CONFIG_MFD_NVEC) += nvec/ 
obj-$(CONFIG_STAGING_BOARD)	+= board/

obj-$(CONFIG_LTE_GDM724X)	+= gdm724x/

obj-$(CONFIG_FIREWIRE_SERIAL)	+= fwserial/

obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD)	+= clocking-wizard/

obj-$(CONFIG_FB_TFT)		+= fbtft/

obj-$(CONFIG_MOST)		+= most/

obj-$(CONFIG_KS7010)		+= ks7010/