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

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>

authored by

Shubhrajyoti Datta and committed by
Stephen Boyd
c822490f 35dbdcac

+14 -59
+11
drivers/clk/xilinx/Kconfig
··· 17 17 To compile this driver as a module, choose M here: the 18 18 module will be called xlnx_vcu. 19 19 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 +
+1
drivers/clk/xilinx/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 2 obj-$(CONFIG_XILINX_VCU) += xlnx_vcu.o 3 + obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD) += clk-xlnx-clock-wizard.o
-2
drivers/staging/Kconfig
··· 62 62 63 63 source "drivers/staging/fwserial/Kconfig" 64 64 65 - source "drivers/staging/clocking-wizard/Kconfig" 66 - 67 65 source "drivers/staging/fbtft/Kconfig" 68 66 69 67 source "drivers/staging/most/Kconfig"
-1
drivers/staging/Makefile
··· 21 21 obj-$(CONFIG_STAGING_BOARD) += board/ 22 22 obj-$(CONFIG_LTE_GDM724X) += gdm724x/ 23 23 obj-$(CONFIG_FIREWIRE_SERIAL) += fwserial/ 24 - obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD) += clocking-wizard/ 25 24 obj-$(CONFIG_FB_TFT) += fbtft/ 26 25 obj-$(CONFIG_MOST) += most/ 27 26 obj-$(CONFIG_KS7010) += ks7010/
-10
drivers/staging/clocking-wizard/Kconfig
··· 1 - # SPDX-License-Identifier: GPL-2.0 2 - # 3 - # Xilinx Clocking Wizard Driver 4 - # 5 - 6 - config COMMON_CLK_XLNX_CLKWZRD 7 - tristate "Xilinx Clocking Wizard" 8 - depends on COMMON_CLK && OF && HAS_IOMEM 9 - help 10 - Support for the Xilinx Clocking Wizard IP core clock generator.
-2
drivers/staging/clocking-wizard/Makefile
··· 1 - # SPDX-License-Identifier: GPL-2.0 2 - obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD) += clk-xlnx-clock-wizard.o
-13
drivers/staging/clocking-wizard/TODO
··· 1 - TODO: 2 - - support for fractional multiplier 3 - - support for fractional divider (output 0 only) 4 - - support for set_rate() operations (may benefit from Stephen Boyd's 5 - refactoring of the clk primitives: 6 - https://lore.kernel.org/lkml/1409957256-23729-1-git-send-email-sboyd@codeaurora.org) 7 - - review arithmetic 8 - - overflow after multiplication? 9 - - maximize accuracy before divisions 10 - 11 - Patches to: 12 - Greg Kroah-Hartman <gregkh@linuxfoundation.org> 13 - Sören Brinkmann <soren.brinkmann@xilinx.com>
+2 -1
drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c drivers/clk/xilinx/clk-xlnx-clock-wizard.c
··· 2 2 /* 3 3 * Xilinx 'Clocking Wizard' driver 4 4 * 5 - * Copyright (C) 2013 - 2014 Xilinx 5 + * Copyright (C) 2013 - 2021 Xilinx 6 6 * 7 7 * Sören Brinkmann <soren.brinkmann@xilinx.com> 8 + * 8 9 */ 9 10 10 11 #include <linux/platform_device.h>
-30
drivers/staging/clocking-wizard/dt-binding.txt
··· 1 - Binding for Xilinx Clocking Wizard IP Core 2 - 3 - This binding uses the common clock binding[1]. Details about the devices can be 4 - found in the product guide[2]. 5 - 6 - [1] Documentation/devicetree/bindings/clock/clock-bindings.txt 7 - [2] Clocking Wizard Product Guide 8 - https://www.xilinx.com/support/documentation/ip_documentation/clk_wiz/v5_1/pg065-clk-wiz.pdf 9 - 10 - Required properties: 11 - - compatible: Must be 'xlnx,clocking-wizard' 12 - - reg: Base and size of the cores register space 13 - - clocks: Handle to input clock 14 - - clock-names: Tuple containing 'clk_in1' and 's_axi_aclk' 15 - - clock-output-names: Names for the output clocks 16 - 17 - Optional properties: 18 - - speed-grade: Speed grade of the device (valid values are 1..3) 19 - 20 - Example: 21 - clock-generator@40040000 { 22 - reg = <0x40040000 0x1000>; 23 - compatible = "xlnx,clocking-wizard"; 24 - speed-grade = <1>; 25 - clock-names = "clk_in1", "s_axi_aclk"; 26 - clocks = <&clkc 15>, <&clkc 15>; 27 - clock-output-names = "clk_out0", "clk_out1", "clk_out2", 28 - "clk_out3", "clk_out4", "clk_out5", 29 - "clk_out6", "clk_out7"; 30 - };