diff mbox

[U-Boot,7/8] zynq: Move zynq to clock framework

Message ID 1483532844-20649-8-git-send-email-stefan.herbrechtsmeier@weidmueller.com
State Superseded
Delegated to: Michal Simek
Headers show

Commit Message

Herbrechtsmeier Dr.-Ing. , Stefan Jan. 4, 2017, 12:27 p.m. UTC
From: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.de>

Move the zynq to clock framework and remove unused functions as well as
the CONFIG_ZYNQ_PS_CLK_FREQ configuration.

Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
---

 arch/arm/Kconfig                            |   2 +
 arch/arm/dts/zynq-7000.dtsi                 |   2 +
 arch/arm/mach-zynq/clk.c                    | 650 +++-------------------------
 arch/arm/mach-zynq/cpu.c                    |   1 -
 arch/arm/mach-zynq/include/mach/clk.h       |   5 -
 arch/arm/mach-zynq/include/mach/sys_proto.h |   1 -
 arch/arm/mach-zynq/slcr.c                   |  22 -
 arch/arm/mach-zynq/timer.c                  |   2 -
 drivers/net/zynq_gem.c                      |  13 -
 drivers/serial/serial_zynq.c                |   6 +-
 include/configs/topic_miami.h               |   2 -
 include/configs/zynq_zybo.h                 |   3 -
 scripts/config_whitelist.txt                |   1 -
 13 files changed, 55 insertions(+), 655 deletions(-)

Comments

Michal Simek Jan. 10, 2017, 3:04 p.m. UTC | #1
On 4.1.2017 13:27, stefan.herbrechtsmeier@weidmueller.com wrote:
> From: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.de>
> 
> Move the zynq to clock framework and remove unused functions as well as
> the CONFIG_ZYNQ_PS_CLK_FREQ configuration.
> 
> Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
> ---
> 
>  arch/arm/Kconfig                            |   2 +
>  arch/arm/dts/zynq-7000.dtsi                 |   2 +
>  arch/arm/mach-zynq/clk.c                    | 650 +++-------------------------
>  arch/arm/mach-zynq/cpu.c                    |   1 -
>  arch/arm/mach-zynq/include/mach/clk.h       |   5 -
>  arch/arm/mach-zynq/include/mach/sys_proto.h |   1 -
>  arch/arm/mach-zynq/slcr.c                   |  22 -
>  arch/arm/mach-zynq/timer.c                  |   2 -
>  drivers/net/zynq_gem.c                      |  13 -
>  drivers/serial/serial_zynq.c                |   6 +-
>  include/configs/topic_miami.h               |   2 -
>  include/configs/zynq_zybo.h                 |   3 -
>  scripts/config_whitelist.txt                |   1 -
>  13 files changed, 55 insertions(+), 655 deletions(-)
> 
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 38080c0..f9daa99 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -631,6 +631,8 @@ config ARCH_ZYNQ
>  	select SPL_SEPARATE_BSS if SPL
>  	select DM_USB if USB
>  	select BLK
> +	select CLK
> +	select SPL_CLK
>  
>  config ARCH_ZYNQMP
>  	bool "Support Xilinx ZynqMP Platform"
> diff --git a/arch/arm/dts/zynq-7000.dtsi b/arch/arm/dts/zynq-7000.dtsi
> index 668f54e..2464830 100644
> --- a/arch/arm/dts/zynq-7000.dtsi
> +++ b/arch/arm/dts/zynq-7000.dtsi
> @@ -250,12 +250,14 @@
>  		};
>  
>  		slcr: slcr@f8000000 {
> +			u-boot,dm-pre-reloc;
>  			#address-cells = <1>;
>  			#size-cells = <1>;
>  			compatible = "xlnx,zynq-slcr", "syscon", "simple-mfd";
>  			reg = <0xF8000000 0x1000>;
>  			ranges;
>  			clkc: clkc@100 {
> +				u-boot,dm-pre-reloc;
>  				#clock-cells = <1>;
>  				compatible = "xlnx,ps7-clkc";
>  				fclk-enable = <0>;
> diff --git a/arch/arm/mach-zynq/clk.c b/arch/arm/mach-zynq/clk.c
> index 570ebd7..7283a94 100644
> --- a/arch/arm/mach-zynq/clk.c
> +++ b/arch/arm/mach-zynq/clk.c
> @@ -4,77 +4,13 @@
>   *
>   * SPDX-License-Identifier:	GPL-2.0+
>   */
> +#include <clk.h>
>  #include <common.h>
> -#include <errno.h>
> -#include <asm/io.h>
> -#include <asm/arch/hardware.h>
> +#include <dm.h>
>  #include <asm/arch/clk.h>
>  
> -/* Board oscillator frequency */
> -#ifndef CONFIG_ZYNQ_PS_CLK_FREQ
> -# define CONFIG_ZYNQ_PS_CLK_FREQ	33333333UL
> -#endif
> -
> -/* Register bitfield defines */
> -#define PLLCTRL_FBDIV_MASK	0x7f000
> -#define PLLCTRL_FBDIV_SHIFT	12
> -#define PLLCTRL_BPFORCE_MASK	(1 << 4)
> -#define PLLCTRL_PWRDWN_MASK	2
> -#define PLLCTRL_PWRDWN_SHIFT	1
> -#define PLLCTRL_RESET_MASK	1
> -#define PLLCTRL_RESET_SHIFT	0
> -
> -#define ZYNQ_CLK_MAXDIV		0x3f
> -#define CLK_CTRL_DIV1_SHIFT	20
> -#define CLK_CTRL_DIV1_MASK	(ZYNQ_CLK_MAXDIV << CLK_CTRL_DIV1_SHIFT)
> -#define CLK_CTRL_DIV0_SHIFT	8
> -#define CLK_CTRL_DIV0_MASK	(ZYNQ_CLK_MAXDIV << CLK_CTRL_DIV0_SHIFT)
> -#define CLK_CTRL_SRCSEL_SHIFT	4
> -#define CLK_CTRL_SRCSEL_MASK	(0x3 << CLK_CTRL_SRCSEL_SHIFT)
> -
> -#define CLK_CTRL_DIV2X_SHIFT	26
> -#define CLK_CTRL_DIV2X_MASK	(ZYNQ_CLK_MAXDIV << CLK_CTRL_DIV2X_SHIFT)
> -#define CLK_CTRL_DIV3X_SHIFT	20
> -#define CLK_CTRL_DIV3X_MASK	(ZYNQ_CLK_MAXDIV << CLK_CTRL_DIV3X_SHIFT)
> -
> -#define ZYNQ_CLKMUX_SEL_0	0
> -#define ZYNQ_CLKMUX_SEL_1	1
> -#define ZYNQ_CLKMUX_SEL_2	2
> -#define ZYNQ_CLKMUX_SEL_3	3
> -
>  DECLARE_GLOBAL_DATA_PTR;
>  
> -struct clk;
> -
> -/**
> - * struct zynq_clk_ops:
> - * @set_rate:	Function pointer to set_rate() implementation
> - * @get_rate:	Function pointer to get_rate() implementation
> - */
> -struct zynq_clk_ops {
> -	int (*set_rate)(struct clk *clk, unsigned long rate);
> -	unsigned long (*get_rate)(struct clk *clk);
> -};
> -
> -/**
> - * struct clk:
> - * @frequency:	Currenct frequency
> - * @parent:	Parent clock
> - * @flags:	Clock flags
> - * @reg:	Clock control register
> - * @ops:	Clock operations
> - */
> -struct clk {
> -	unsigned long	frequency;
> -	enum zynq_clk	parent;
> -	unsigned int	flags;
> -	u32		*reg;
> -	struct zynq_clk_ops	ops;
> -};
> -#define ZYNQ_CLK_FLAGS_HAS_2_DIVS	1
> -
> -static struct clk clks[clk_max];
> -
>  static const char * const clk_names[clk_max] = {
>  	"armpll", "ddrpll", "iopll",
>  	"cpu_6or4x", "cpu_3or2x", "cpu_2x", "cpu_1x",
> @@ -90,548 +26,43 @@ static const char * const clk_names[clk_max] = {
>  };
>  
>  /**
> - * __zynq_clk_cpu_get_parent() - Decode clock multiplexer
> - * @srcsel:	Mux select value
> - * Returns the clock identifier associated with the selected mux input.
> - */
> -static int __zynq_clk_cpu_get_parent(unsigned int srcsel)
> -{
> -	unsigned int ret;
> -
> -	switch (srcsel) {
> -	case ZYNQ_CLKMUX_SEL_0:
> -	case ZYNQ_CLKMUX_SEL_1:
> -		ret = armpll_clk;
> -		break;
> -	case ZYNQ_CLKMUX_SEL_2:
> -		ret = ddrpll_clk;
> -		break;
> -	case ZYNQ_CLKMUX_SEL_3:
> -		ret = iopll_clk;
> -		break;
> -	default:
> -		ret = armpll_clk;
> -		break;
> -	}
> -
> -	return ret;
> -}
> -
> -/**
> - * ddr2x_get_rate() - Get clock rate of DDR2x clock
> - * @clk:	Clock handle
> - * Returns the current clock rate of @clk.
> - */
> -static unsigned long ddr2x_get_rate(struct clk *clk)
> -{
> -	u32 clk_ctrl = readl(clk->reg);
> -	u32 div = (clk_ctrl & CLK_CTRL_DIV2X_MASK) >> CLK_CTRL_DIV2X_SHIFT;
> -
> -	return DIV_ROUND_CLOSEST(zynq_clk_get_rate(clk->parent), div);
> -}
> -
> -/**
> - * ddr3x_get_rate() - Get clock rate of DDR3x clock
> - * @clk:	Clock handle
> - * Returns the current clock rate of @clk.
> - */
> -static unsigned long ddr3x_get_rate(struct clk *clk)
> -{
> -	u32 clk_ctrl = readl(clk->reg);
> -	u32 div = (clk_ctrl & CLK_CTRL_DIV3X_MASK) >> CLK_CTRL_DIV3X_SHIFT;
> -
> -	return DIV_ROUND_CLOSEST(zynq_clk_get_rate(clk->parent), div);
> -}
> -
> -static void init_ddr_clocks(void)
> -{
> -	u32 div0, div1;
> -	unsigned long prate = zynq_clk_get_rate(ddrpll_clk);
> -	u32 clk_ctrl = readl(&slcr_base->ddr_clk_ctrl);
> -
> -	/* DDR2x */
> -	clks[ddr2x_clk].reg = &slcr_base->ddr_clk_ctrl;
> -	clks[ddr2x_clk].parent = ddrpll_clk;
> -	clks[ddr2x_clk].frequency = ddr2x_get_rate(&clks[ddr2x_clk]);
> -	clks[ddr2x_clk].ops.get_rate = ddr2x_get_rate;
> -
> -	/* DDR3x */
> -	clks[ddr3x_clk].reg = &slcr_base->ddr_clk_ctrl;
> -	clks[ddr3x_clk].parent = ddrpll_clk;
> -	clks[ddr3x_clk].frequency = ddr3x_get_rate(&clks[ddr3x_clk]);
> -	clks[ddr3x_clk].ops.get_rate = ddr3x_get_rate;
> -
> -	/* DCI */
> -	clk_ctrl = readl(&slcr_base->dci_clk_ctrl);
> -	div0 = (clk_ctrl & CLK_CTRL_DIV0_MASK) >> CLK_CTRL_DIV0_SHIFT;
> -	div1 = (clk_ctrl & CLK_CTRL_DIV1_MASK) >> CLK_CTRL_DIV1_SHIFT;
> -	clks[dci_clk].reg = &slcr_base->dci_clk_ctrl;
> -	clks[dci_clk].parent = ddrpll_clk;
> -	clks[dci_clk].frequency = DIV_ROUND_CLOSEST(
> -			DIV_ROUND_CLOSEST(prate, div0), div1);
> -
> -	gd->bd->bi_ddr_freq = clks[ddr3x_clk].frequency / 1000000;
> -}
> -
> -static void init_cpu_clocks(void)
> -{
> -	int clk_621;
> -	u32 reg, div, srcsel;
> -	enum zynq_clk parent;
> -
> -	reg = readl(&slcr_base->arm_clk_ctrl);
> -	clk_621 = readl(&slcr_base->clk_621_true) & 1;
> -	div = (reg & CLK_CTRL_DIV0_MASK) >> CLK_CTRL_DIV0_SHIFT;
> -	srcsel = (reg & CLK_CTRL_SRCSEL_MASK) >> CLK_CTRL_SRCSEL_SHIFT;
> -	parent = __zynq_clk_cpu_get_parent(srcsel);
> -
> -	/* cpu clocks */
> -	clks[cpu_6or4x_clk].reg = &slcr_base->arm_clk_ctrl;
> -	clks[cpu_6or4x_clk].parent = parent;
> -	clks[cpu_6or4x_clk].frequency = DIV_ROUND_CLOSEST(
> -			zynq_clk_get_rate(parent), div);
> -
> -	clks[cpu_3or2x_clk].reg = &slcr_base->arm_clk_ctrl;
> -	clks[cpu_3or2x_clk].parent = cpu_6or4x_clk;
> -	clks[cpu_3or2x_clk].frequency = zynq_clk_get_rate(cpu_6or4x_clk) / 2;
> -
> -	clks[cpu_2x_clk].reg = &slcr_base->arm_clk_ctrl;
> -	clks[cpu_2x_clk].parent = cpu_6or4x_clk;
> -	clks[cpu_2x_clk].frequency = zynq_clk_get_rate(cpu_6or4x_clk) /
> -			(2 + clk_621);
> -
> -	clks[cpu_1x_clk].reg = &slcr_base->arm_clk_ctrl;
> -	clks[cpu_1x_clk].parent = cpu_6or4x_clk;
> -	clks[cpu_1x_clk].frequency = zynq_clk_get_rate(cpu_6or4x_clk) /
> -			(4 + 2 * clk_621);
> -}
> -
> -/**
> - * periph_calc_two_divs() - Calculate clock dividers
> - * @cur_rate:	Current clock rate
> - * @tgt_rate:	Target clock rate
> - * @prate:	Parent clock rate
> - * @div0:	First divider (output)
> - * @div1:	Second divider (output)
> - * Returns the actual clock rate possible.
> - *
> - * Calculates clock dividers for clocks with two 6-bit dividers.
> - */
> -static unsigned long periph_calc_two_divs(unsigned long cur_rate,
> -		unsigned long tgt_rate, unsigned long prate, u32 *div0,
> -		u32 *div1)
> -{
> -	long err, best_err = (long)(~0UL >> 1);
> -	unsigned long rate, best_rate = 0;
> -	u32 d0, d1;
> -
> -	for (d0 = 1; d0 <= ZYNQ_CLK_MAXDIV; d0++) {
> -		for (d1 = 1; d1 <= ZYNQ_CLK_MAXDIV >> 1; d1++) {
> -			rate = DIV_ROUND_CLOSEST(DIV_ROUND_CLOSEST(prate, d0),
> -					d1);
> -			err = abs(rate - tgt_rate);
> -
> -			if (err < best_err) {
> -				*div0 = d0;
> -				*div1 = d1;
> -				best_err = err;
> -				best_rate = rate;
> -			}
> -		}
> -	}
> -
> -	return best_rate;
> -}
> -
> -/**
> - * zynq_clk_periph_set_rate() - Set clock rate
> - * @clk:	Handle of the peripheral clock
> - * @rate:	New clock rate
> - * Sets the clock frequency of @clk to @rate. Returns zero on success.
> - */
> -static int zynq_clk_periph_set_rate(struct clk *clk,
> -		unsigned long rate)
> -{
> -	u32 ctrl, div0 = 0, div1 = 0;
> -	unsigned long prate, new_rate, cur_rate = clk->frequency;
> -
> -	ctrl = readl(clk->reg);
> -	prate = zynq_clk_get_rate(clk->parent);
> -	ctrl &= ~CLK_CTRL_DIV0_MASK;
> -
> -	if (clk->flags & ZYNQ_CLK_FLAGS_HAS_2_DIVS) {
> -		ctrl &= ~CLK_CTRL_DIV1_MASK;
> -		new_rate = periph_calc_two_divs(cur_rate, rate, prate, &div0,
> -				&div1);
> -		ctrl |= div1 << CLK_CTRL_DIV1_SHIFT;
> -	} else {
> -		div0 = DIV_ROUND_CLOSEST(prate, rate);
> -		div0 &= ZYNQ_CLK_MAXDIV;
> -		new_rate = DIV_ROUND_CLOSEST(rate, div0);
> -	}
> -
> -	/* write new divs to hardware */
> -	ctrl |= div0 << CLK_CTRL_DIV0_SHIFT;
> -	writel(ctrl, clk->reg);
> -
> -	/* update frequency in clk framework */
> -	clk->frequency = new_rate;
> -
> -	return 0;
> -}
> -
> -/**
> - * zynq_clk_periph_get_rate() - Get clock rate
> - * @clk:	Handle of the peripheral clock
> - * Returns the current clock rate of @clk.
> - */
> -static unsigned long zynq_clk_periph_get_rate(struct clk *clk)
> -{
> -	u32 clk_ctrl = readl(clk->reg);
> -	u32 div0 = (clk_ctrl & CLK_CTRL_DIV0_MASK) >> CLK_CTRL_DIV0_SHIFT;
> -	u32 div1 = 1;
> -
> -	if (clk->flags & ZYNQ_CLK_FLAGS_HAS_2_DIVS)
> -		div1 = (clk_ctrl & CLK_CTRL_DIV1_MASK) >> CLK_CTRL_DIV1_SHIFT;
> -
> -	/* a register value of zero == division by 1 */
> -	if (!div0)
> -		div0 = 1;
> -	if (!div1)
> -		div1 = 1;
> -
> -	return
> -		DIV_ROUND_CLOSEST(
> -			DIV_ROUND_CLOSEST(zynq_clk_get_rate(clk->parent), div0),
> -			div1);
> -}
> -
> -/**
> - * __zynq_clk_periph_get_parent() - Decode clock multiplexer
> - * @srcsel:	Mux select value
> - * Returns the clock identifier associated with the selected mux input.
> - */
> -static enum zynq_clk __zynq_clk_periph_get_parent(u32 srcsel)
> -{
> -	switch (srcsel) {
> -	case ZYNQ_CLKMUX_SEL_0:
> -	case ZYNQ_CLKMUX_SEL_1:
> -		return iopll_clk;
> -	case ZYNQ_CLKMUX_SEL_2:
> -		return armpll_clk;
> -	case ZYNQ_CLKMUX_SEL_3:
> -		return ddrpll_clk;
> -	default:
> -		return 0;
> -	}
> -}
> -
> -/**
> - * zynq_clk_periph_get_parent() - Decode clock multiplexer
> - * @clk:	Clock handle
> - * Returns the clock identifier associated with the selected mux input.
> - */
> -static enum zynq_clk zynq_clk_periph_get_parent(struct clk *clk)
> -{
> -	u32 clk_ctrl = readl(clk->reg);
> -	u32 srcsel = (clk_ctrl & CLK_CTRL_SRCSEL_MASK) >> CLK_CTRL_SRCSEL_SHIFT;
> -
> -	return __zynq_clk_periph_get_parent(srcsel);
> -}
> -
> -/**
> - * zynq_clk_register_periph_clk() - Set up a peripheral clock with the framework
> - * @clk:	Pointer to struct clk for the clock
> - * @ctrl:	Clock control register
> - * @two_divs:	Indicates whether the clock features one or two dividers
> - */
> -static int zynq_clk_register_periph_clk(struct clk *clk, u32 *ctrl,
> -		bool two_divs)
> -{
> -	clk->reg = ctrl;
> -	if (two_divs)
> -		clk->flags = ZYNQ_CLK_FLAGS_HAS_2_DIVS;
> -	clk->parent = zynq_clk_periph_get_parent(clk);
> -	clk->frequency = zynq_clk_periph_get_rate(clk);
> -	clk->ops.get_rate = zynq_clk_periph_get_rate;
> -	clk->ops.set_rate = zynq_clk_periph_set_rate;
> -
> -	return 0;
> -}
> -
> -static void init_periph_clocks(void)
> -{
> -	zynq_clk_register_periph_clk(&clks[gem0_clk],
> -				     &slcr_base->gem0_clk_ctrl, 1);
> -	zynq_clk_register_periph_clk(&clks[gem1_clk],
> -				     &slcr_base->gem1_clk_ctrl, 1);
> -
> -	zynq_clk_register_periph_clk(&clks[smc_clk],
> -				     &slcr_base->smc_clk_ctrl, 0);
> -
> -	zynq_clk_register_periph_clk(&clks[lqspi_clk],
> -				     &slcr_base->lqspi_clk_ctrl, 0);
> -
> -	zynq_clk_register_periph_clk(&clks[sdio0_clk],
> -				     &slcr_base->sdio_clk_ctrl, 0);
> -	zynq_clk_register_periph_clk(&clks[sdio1_clk],
> -				     &slcr_base->sdio_clk_ctrl, 0);
> -
> -	zynq_clk_register_periph_clk(&clks[spi0_clk],
> -				     &slcr_base->spi_clk_ctrl, 0);
> -	zynq_clk_register_periph_clk(&clks[spi1_clk],
> -				     &slcr_base->spi_clk_ctrl, 0);
> -
> -	zynq_clk_register_periph_clk(&clks[uart0_clk],
> -				     &slcr_base->uart_clk_ctrl, 0);
> -	zynq_clk_register_periph_clk(&clks[uart1_clk],
> -				     &slcr_base->uart_clk_ctrl, 0);
> -
> -	zynq_clk_register_periph_clk(&clks[dbg_trc_clk],
> -				     &slcr_base->dbg_clk_ctrl, 0);
> -	zynq_clk_register_periph_clk(&clks[dbg_apb_clk],
> -				     &slcr_base->dbg_clk_ctrl, 0);
> -
> -	zynq_clk_register_periph_clk(&clks[pcap_clk],
> -				     &slcr_base->pcap_clk_ctrl, 0);
> -
> -	zynq_clk_register_periph_clk(&clks[fclk0_clk],
> -				     &slcr_base->fpga0_clk_ctrl, 1);
> -	zynq_clk_register_periph_clk(&clks[fclk1_clk],
> -				     &slcr_base->fpga1_clk_ctrl, 1);
> -	zynq_clk_register_periph_clk(&clks[fclk2_clk],
> -				     &slcr_base->fpga2_clk_ctrl, 1);
> -	zynq_clk_register_periph_clk(&clks[fclk3_clk],
> -				     &slcr_base->fpga3_clk_ctrl, 1);
> -}
> -
> -/**
> - * zynq_clk_register_aper_clk() - Set up a APER clock with the framework
> - * @clk:	Pointer to struct clk for the clock
> - * @ctrl:	Clock control register
> - */
> -static void zynq_clk_register_aper_clk(struct clk *clk, u32 *ctrl)
> -{
> -	clk->reg = ctrl;
> -	clk->parent = cpu_1x_clk;
> -	clk->frequency = zynq_clk_get_rate(clk->parent);
> -}
> -
> -static void init_aper_clocks(void)
> -{
> -	zynq_clk_register_aper_clk(&clks[usb0_aper_clk],
> -				   &slcr_base->aper_clk_ctrl);
> -	zynq_clk_register_aper_clk(&clks[usb1_aper_clk],
> -				   &slcr_base->aper_clk_ctrl);
> -
> -	zynq_clk_register_aper_clk(&clks[gem0_aper_clk],
> -				   &slcr_base->aper_clk_ctrl);
> -	zynq_clk_register_aper_clk(&clks[gem1_aper_clk],
> -				   &slcr_base->aper_clk_ctrl);
> -
> -	zynq_clk_register_aper_clk(&clks[sdio0_aper_clk],
> -				   &slcr_base->aper_clk_ctrl);
> -	zynq_clk_register_aper_clk(&clks[sdio1_aper_clk],
> -				   &slcr_base->aper_clk_ctrl);
> -
> -	zynq_clk_register_aper_clk(&clks[spi0_aper_clk],
> -				   &slcr_base->aper_clk_ctrl);
> -	zynq_clk_register_aper_clk(&clks[spi1_aper_clk],
> -				   &slcr_base->aper_clk_ctrl);
> -
> -	zynq_clk_register_aper_clk(&clks[can0_aper_clk],
> -				   &slcr_base->aper_clk_ctrl);
> -	zynq_clk_register_aper_clk(&clks[can1_aper_clk],
> -				   &slcr_base->aper_clk_ctrl);
> -
> -	zynq_clk_register_aper_clk(&clks[i2c0_aper_clk],
> -				   &slcr_base->aper_clk_ctrl);
> -	zynq_clk_register_aper_clk(&clks[i2c1_aper_clk],
> -				   &slcr_base->aper_clk_ctrl);
> -
> -	zynq_clk_register_aper_clk(&clks[uart0_aper_clk],
> -				   &slcr_base->aper_clk_ctrl);
> -	zynq_clk_register_aper_clk(&clks[uart1_aper_clk],
> -				   &slcr_base->aper_clk_ctrl);
> -
> -	zynq_clk_register_aper_clk(&clks[gpio_aper_clk],
> -				   &slcr_base->aper_clk_ctrl);
> -
> -	zynq_clk_register_aper_clk(&clks[lqspi_aper_clk],
> -				   &slcr_base->aper_clk_ctrl);
> -
> -	zynq_clk_register_aper_clk(&clks[smc_aper_clk],
> -				   &slcr_base->aper_clk_ctrl);
> -}
> -
> -/**
> - * __zynq_clk_pll_get_rate() - Get PLL rate
> - * @addr:	Address of the PLL's control register
> - * Returns the current PLL output rate.
> - */
> -static unsigned long __zynq_clk_pll_get_rate(u32 *addr)
> -{
> -	u32 reg, mul, bypass;
> -
> -	reg = readl(addr);
> -	bypass = reg & PLLCTRL_BPFORCE_MASK;
> -	if (bypass)
> -		mul = 1;
> -	else
> -		mul = (reg & PLLCTRL_FBDIV_MASK) >> PLLCTRL_FBDIV_SHIFT;
> -
> -	return CONFIG_ZYNQ_PS_CLK_FREQ * mul;
> -}
> -
> -/**
> - * zynq_clk_pll_get_rate() - Get PLL rate
> - * @pll:	Handle of the PLL
> - * Returns the current clock rate of @pll.
> - */
> -static unsigned long zynq_clk_pll_get_rate(struct clk *pll)
> -{
> -	return __zynq_clk_pll_get_rate(pll->reg);
> -}
> -
> -/**
> - * zynq_clk_register_pll() - Set up a PLL with the framework
> - * @clk:	Pointer to struct clk for the PLL
> - * @ctrl:	PLL control register
> - * @prate:	PLL input clock rate
> - */
> -static void zynq_clk_register_pll(struct clk *clk, u32 *ctrl,
> -		unsigned long prate)
> -{
> -	clk->reg = ctrl;
> -	clk->frequency = zynq_clk_pll_get_rate(clk);
> -	clk->ops.get_rate = zynq_clk_pll_get_rate;
> -}
> -
> -/**
> - * clkid_2_register() - Get clock control register
> - * @id:	Clock identifier of one of the PLLs
> - * Returns the address of the requested PLL's control register.
> - */
> -static u32 *clkid_2_register(enum zynq_clk id)
> -{
> -	switch (id) {
> -	case armpll_clk:
> -		return &slcr_base->arm_pll_ctrl;
> -	case ddrpll_clk:
> -		return &slcr_base->ddr_pll_ctrl;
> -	case iopll_clk:
> -		return &slcr_base->io_pll_ctrl;
> -	default:
> -		return &slcr_base->io_pll_ctrl;
> -	}
> -}
> -
> -/* API */
> -/**
> - * zynq_clk_early_init() - Early init for the clock framework
> - *
> - * This function is called from before relocation and sets up the CPU clock
> - * frequency in the global data struct.
> - */
> -void zynq_clk_early_init(void)
> -{
> -	u32 reg = readl(&slcr_base->arm_clk_ctrl);
> -	u32 div = (reg & CLK_CTRL_DIV0_MASK) >> CLK_CTRL_DIV0_SHIFT;
> -	u32 srcsel = (reg & CLK_CTRL_SRCSEL_MASK) >> CLK_CTRL_SRCSEL_SHIFT;
> -	enum zynq_clk parent = __zynq_clk_cpu_get_parent(srcsel);
> -	u32 *pllreg = clkid_2_register(parent);
> -	unsigned long prate = __zynq_clk_pll_get_rate(pllreg);
> -
> -	if (!div)
> -		div = 1;
> -
> -	gd->cpu_clk = DIV_ROUND_CLOSEST(prate, div);
> -}
> -
> -/**
> - * get_uart_clk() - Get UART input frequency
> - * @dev_index:	UART ID
> - * Returns UART input clock frequency in Hz.
> - *
> - * Compared to zynq_clk_get_rate() this function is designed to work before
> - * relocation and can be called when the serial UART is set up.
> - */
> -unsigned long get_uart_clk(int dev_index)
> -{
> -	u32 reg = readl(&slcr_base->uart_clk_ctrl);
> -	u32 div = (reg & CLK_CTRL_DIV0_MASK) >> CLK_CTRL_DIV0_SHIFT;
> -	u32 srcsel = (reg & CLK_CTRL_SRCSEL_MASK) >> CLK_CTRL_SRCSEL_SHIFT;
> -	enum zynq_clk parent = __zynq_clk_periph_get_parent(srcsel);
> -	u32 *pllreg = clkid_2_register(parent);
> -	unsigned long prate = __zynq_clk_pll_get_rate(pllreg);
> -
> -	if (!div)
> -		div = 1;
> -
> -	return DIV_ROUND_CLOSEST(prate, div);
> -}
> -
> -/**
> - * set_cpu_clk_info() - Initialize clock framework
> - * Always returns zero.
> + * set_cpu_clk_info() - Setup clock information
>   *
>   * This function is called from common code after relocation and sets up the
> - * clock framework. The framework must not be used before this function had been
> - * called.
> + * clock information.
>   */
>  int set_cpu_clk_info(void)
>  {
> -	zynq_clk_register_pll(&clks[armpll_clk], &slcr_base->arm_pll_ctrl,
> -			      CONFIG_ZYNQ_PS_CLK_FREQ);
> -	zynq_clk_register_pll(&clks[ddrpll_clk], &slcr_base->ddr_pll_ctrl,
> -			      CONFIG_ZYNQ_PS_CLK_FREQ);
> -	zynq_clk_register_pll(&clks[iopll_clk], &slcr_base->io_pll_ctrl,
> -			      CONFIG_ZYNQ_PS_CLK_FREQ);
> -
> -	init_ddr_clocks();
> -	init_cpu_clocks();
> -	init_periph_clocks();
> -	init_aper_clocks();
> -
> -	gd->bd->bi_arm_freq = gd->cpu_clk / 1000000;
> +	struct clk clk;
> +	struct udevice *dev;
> +	ulong rate;
> +	int i, ret;
> +
> +	ret = uclass_get_device_by_driver(UCLASS_CLK,
> +		DM_GET_DRIVER(zynq_clk), &dev);
> +	if (ret)
> +		return ret;
> +
> +	for (i = 0; i < 2; i++) {
> +		clk.id = i ? ddr3x_clk : cpu_6or4x_clk;
> +		ret = clk_request(dev, &clk);
> +		if (ret < 0)
> +			return ret;
> +
> +		rate = clk_get_rate(&clk) / 1000000;
> +		if (i)
> +			gd->bd->bi_ddr_freq = rate;
> +		else
> +			gd->bd->bi_arm_freq = rate;
> +
> +		clk_free(&clk);
> +	}
>  	gd->bd->bi_dsp_freq = 0;
>  
>  	return 0;
>  }
>  
>  /**
> - * zynq_clk_get_rate() - Get clock rate
> - * @clk:	Clock identifier
> - * Returns the current clock rate of @clk on success or zero for an invalid
> - * clock id.
> - */
> -unsigned long zynq_clk_get_rate(enum zynq_clk clk)
> -{
> -	if (clk < 0 || clk >= clk_max)
> -		return 0;
> -
> -	return clks[clk].frequency;
> -}
> -
> -/**
> - * zynq_clk_set_rate() - Set clock rate
> - * @clk:	Clock identifier
> - * @rate:	Requested clock rate
> - * Passes on the return value from the clock's set_rate() function or negative
> - * errno.
> - */
> -int zynq_clk_set_rate(enum zynq_clk clk, unsigned long rate)
> -{
> -	if (clk < 0 || clk >= clk_max)
> -		return -ENODEV;
> -
> -	if (clks[clk].ops.set_rate)
> -		return clks[clk].ops.set_rate(&clks[clk], rate);
> -
> -	return -ENXIO;
> -}
> -
> -/**
>   * soc_clk_dump() - Print clock frequencies
>   * Returns zero on success
>   *
> @@ -639,13 +70,32 @@ int zynq_clk_set_rate(enum zynq_clk clk, unsigned long rate)
>   */
>  int soc_clk_dump(void)
>  {
> -	int i;
> +	struct udevice *dev;
> +	int i, ret;
> +
> +	ret = uclass_get_device_by_driver(UCLASS_CLK,
> +		DM_GET_DRIVER(zynq_clk), &dev);
> +	if (ret)
> +		return ret;
>  
>  	printf("clk\t\tfrequency\n");
>  	for (i = 0; i < clk_max; i++) {
>  		const char *name = clk_names[i];
> -		if (name)
> -			printf("%10s%20lu\n", name, zynq_clk_get_rate(i));
> +		if (name) {
> +			struct clk clk;
> +			unsigned long rate;
> +
> +			clk.id = i;
> +			ret = clk_request(dev, &clk);
> +			if (ret < 0)
> +				return ret;
> +
> +			rate = clk_get_rate(&clk);
> +
> +			clk_free(&clk);
> +
> +			printf("%10s%20lu\n", name, rate);
> +		}
>  	}
>  
>  	return 0;
> diff --git a/arch/arm/mach-zynq/cpu.c b/arch/arm/mach-zynq/cpu.c
> index ba9171e..ee1c1a9 100644
> --- a/arch/arm/mach-zynq/cpu.c
> +++ b/arch/arm/mach-zynq/cpu.c
> @@ -35,7 +35,6 @@ int arch_cpu_init(void)
>  	writel(0xC, &slcr_base->ddr_urgent);
>  #endif
>  #endif
> -	zynq_clk_early_init();
>  	zynq_slcr_lock();
>  
>  	return 0;
> diff --git a/arch/arm/mach-zynq/include/mach/clk.h b/arch/arm/mach-zynq/include/mach/clk.h
> index 5c2758a..8a039ae 100644
> --- a/arch/arm/mach-zynq/include/mach/clk.h
> +++ b/arch/arm/mach-zynq/include/mach/clk.h
> @@ -20,9 +20,4 @@ enum zynq_clk {
>  	uart0_aper_clk, uart1_aper_clk, gpio_aper_clk, lqspi_aper_clk,
>  	smc_aper_clk, swdt_clk, dbg_trc_clk, dbg_apb_clk, clk_max};
>  
> -void zynq_clk_early_init(void);
> -int zynq_clk_set_rate(enum zynq_clk clk, unsigned long rate);
> -unsigned long zynq_clk_get_rate(enum zynq_clk clk);
> -unsigned long get_uart_clk(int dev_id);
> -
>  #endif
> diff --git a/arch/arm/mach-zynq/include/mach/sys_proto.h b/arch/arm/mach-zynq/include/mach/sys_proto.h
> index 44c9b50..67238e7 100644
> --- a/arch/arm/mach-zynq/include/mach/sys_proto.h
> +++ b/arch/arm/mach-zynq/include/mach/sys_proto.h
> @@ -10,7 +10,6 @@
>  extern void zynq_slcr_lock(void);
>  extern void zynq_slcr_unlock(void);
>  extern void zynq_slcr_cpu_reset(void);
> -extern void zynq_slcr_gem_clk_setup(u32 gem_id, unsigned long clk_rate);
>  extern void zynq_slcr_devcfg_disable(void);
>  extern void zynq_slcr_devcfg_enable(void);
>  extern u32 zynq_slcr_get_boot_mode(void);
> diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c
> index c1129cd..2a207ae 100644
> --- a/arch/arm/mach-zynq/slcr.c
> +++ b/arch/arm/mach-zynq/slcr.c
> @@ -9,7 +9,6 @@
>  #include <malloc.h>
>  #include <asm/arch/hardware.h>
>  #include <asm/arch/sys_proto.h>
> -#include <asm/arch/clk.h>
>  
>  #define SLCR_LOCK_MAGIC		0x767B
>  #define SLCR_UNLOCK_MAGIC	0xDF0D
> @@ -124,27 +123,6 @@ void zynq_slcr_cpu_reset(void)
>  	writel(1, &slcr_base->pss_rst_ctrl);
>  }
>  
> -/* Setup clk for network */
> -void zynq_slcr_gem_clk_setup(u32 gem_id, unsigned long clk_rate)
> -{
> -	int ret;
> -
> -	zynq_slcr_unlock();
> -
> -	if (gem_id > 1) {
> -		printf("Non existing GEM id %d\n", gem_id);
> -		goto out;
> -	}
> -
> -	ret = zynq_clk_set_rate(gem0_clk + gem_id, clk_rate);
> -	if (ret)
> -		goto out;
> -
> -	udelay(100000);
> -out:
> -	zynq_slcr_lock();
> -}
> -
>  void zynq_slcr_devcfg_disable(void)
>  {
>  	u32 reg_val;
> diff --git a/arch/arm/mach-zynq/timer.c b/arch/arm/mach-zynq/timer.c
> index 0335cbe..b1bb3b8 100644
> --- a/arch/arm/mach-zynq/timer.c
> +++ b/arch/arm/mach-zynq/timer.c
> @@ -61,7 +61,6 @@ int timer_init(void)
>  			(TIMER_PRESCALE << SCUTIMER_CONTROL_PRESCALER_SHIFT) |
>  			SCUTIMER_CONTROL_ENABLE_MASK;
>  
> -#if defined(CONFIG_CLK) || defined(CONFIG_SPL_CLK)
>  	struct udevice *dev;
>  	struct clk clk;
>  	int ret;
> @@ -79,7 +78,6 @@ int timer_init(void)
>  	gd->cpu_clk = clk_get_rate(&clk);
>  
>  	clk_free(&clk);
> -#endif
>  
>  	gd->arch.timer_rate_hz = (gd->cpu_clk / 2) / (TIMER_PRESCALE + 1);
>  
> diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
> index 9118e49..2c95188 100644
> --- a/drivers/net/zynq_gem.c
> +++ b/drivers/net/zynq_gem.c
> @@ -181,9 +181,7 @@ struct zynq_gem_priv {
>  	struct phy_device *phydev;
>  	int phy_of_handle;
>  	struct mii_dev *bus;
> -#if defined(CONFIG_CLK) || defined(CONFIG_SPL_CLK)
>  	struct clk tx_clk;
> -#endif
>  };
>  
>  static inline int mdio_wait(struct zynq_gem_regs *regs)
> @@ -368,9 +366,7 @@ static int zynq_gem_init(struct udevice *dev)
>  	u32 i, nwconfig;
>  	int ret;
>  	unsigned long clk_rate = 0;
> -#if defined(CONFIG_CLK) || defined(CONFIG_SPL_CLK)
>  	unsigned long clk_rate_rounded;
> -#endif
>  	struct zynq_gem_priv *priv = dev_get_priv(dev);
>  	struct zynq_gem_regs *regs = priv->iobase;
>  	struct emac_bd *dummy_tx_bd = &priv->tx_bd[TX_FREE_DESC];
> @@ -473,7 +469,6 @@ static int zynq_gem_init(struct udevice *dev)
>  		break;
>  	}
>  
> -#if defined(CONFIG_CLK) || defined(CONFIG_SPL_CLK)
>  	clk_rate_rounded = clk_set_rate(&priv->tx_clk, clk_rate);
>  	if (IS_ERR_VALUE(clk_rate_rounded)) {
>  		dev_err(dev, "failed to set tx clock rate\n");
> @@ -485,10 +480,6 @@ static int zynq_gem_init(struct udevice *dev)
>  		dev_err(dev, "failed to enable tx clock\n");
>  		return ret;
>  	}
> -#else
> -	zynq_slcr_gem_clk_setup((ulong)priv->iobase !=
> -				ZYNQ_GEM_BASEADDR0, clk_rate);
> -#endif
>  
>  	setbits_le32(&regs->nwctrl, ZYNQ_GEM_NWCTRL_RXEN_MASK |
>  					ZYNQ_GEM_NWCTRL_TXEN_MASK);
> @@ -699,9 +690,7 @@ static int zynq_gem_ofdata_to_platdata(struct udevice *dev)
>  	struct eth_pdata *pdata = dev_get_platdata(dev);
>  	struct zynq_gem_priv *priv = dev_get_priv(dev);
>  	const char *phy_mode;
> -#if defined(CONFIG_CLK) || defined(CONFIG_SPL_CLK)
>  	int ret;
> -#endif
>  
>  	pdata->iobase = (phys_addr_t)dev_get_addr(dev);
>  	priv->iobase = (struct zynq_gem_regs *)pdata->iobase;
> @@ -723,13 +712,11 @@ static int zynq_gem_ofdata_to_platdata(struct udevice *dev)
>  	}
>  	priv->interface = pdata->phy_interface;
>  
> -#if defined(CONFIG_CLK) || defined(CONFIG_SPL_CLK)
>  	ret = clk_get_by_index(dev, 2, &priv->tx_clk);
>  	if (ret < 0) {
>  		dev_err(dev, "failed to get clock\n");
>  		return ret;
>  	}
> -#endif
>  
>  	printf("ZYNQ GEM: %lx, phyaddr %x, interface %s\n", (ulong)priv->iobase,
>  	       priv->phyaddr, phy_string_for_interface(priv->interface));
> diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c
> index 4f6e7e4..a2967c0 100644
> --- a/drivers/serial/serial_zynq.c
> +++ b/drivers/serial/serial_zynq.c
> @@ -15,7 +15,6 @@
>  #include <asm/io.h>
>  #include <linux/compiler.h>
>  #include <serial.h>
> -#include <asm/arch/clk.h>
>  #include <asm/arch/hardware.h>
>  
>  DECLARE_GLOBAL_DATA_PTR;
> @@ -111,7 +110,6 @@ int zynq_serial_setbrg(struct udevice *dev, int baudrate)
>  	struct zynq_uart_priv *priv = dev_get_priv(dev);
>  	unsigned long clock;
>  
> -#if defined(CONFIG_CLK) || defined(CONFIG_SPL_CLK)
>  	int ret;
>  	struct clk clk;
>  
> @@ -133,9 +131,7 @@ int zynq_serial_setbrg(struct udevice *dev, int baudrate)
>  		dev_err(dev, "failed to enable clock\n");
>  		return ret;
>  	}
> -#else
> -	clock = get_uart_clk(0);
> -#endif
> +
>  	_uart_zynq_serial_setbrg(priv->regs, clock, baudrate);
>  
>  	return 0;
> diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h
> index 3b0fa29..a1ccc42 100644
> --- a/include/configs/topic_miami.h
> +++ b/include/configs/topic_miami.h
> @@ -10,8 +10,6 @@
>  #ifndef __CONFIG_TOPIC_MIAMI_H
>  #define __CONFIG_TOPIC_MIAMI_H
>  
> -#define CONFIG_ZYNQ_PS_CLK_FREQ		33333333UL
> -
>  #define CONFIG_ZYNQ_I2C0
>  #define CONFIG_ZYNQ_I2C1
>  
> diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h
> index b9ff391..1488fd8 100644
> --- a/include/configs/zynq_zybo.h
> +++ b/include/configs/zynq_zybo.h
> @@ -20,9 +20,6 @@
>  #define CONFIG_DISPLAY
>  #define CONFIG_I2C_EDID
>  
> -/* Define ZYBO PS Clock Frequency to 50MHz */
> -#define CONFIG_ZYNQ_PS_CLK_FREQ	50000000UL
> -
>  #include <configs/zynq-common.h>
>  
>  #endif /* __CONFIG_ZYNQ_ZYBO_H */
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 6d614c6..375b9b8 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -8248,7 +8248,6 @@ CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET
>  CONFIG_ZYNQ_HISPD_BROKEN
>  CONFIG_ZYNQ_I2C0
>  CONFIG_ZYNQ_I2C1
> -CONFIG_ZYNQ_PS_CLK_FREQ
>  CONFIG_ZYNQ_SDHCI0
>  CONFIG_ZYNQ_SDHCI1
>  CONFIG_ZYNQ_SDHCI_MAX_FREQ
> 

Looks good.

Acked-by: Michal Simek <michal.simek@xilinx.com>

Thanks,
Michal
diff mbox

Patch

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 38080c0..f9daa99 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -631,6 +631,8 @@  config ARCH_ZYNQ
 	select SPL_SEPARATE_BSS if SPL
 	select DM_USB if USB
 	select BLK
+	select CLK
+	select SPL_CLK
 
 config ARCH_ZYNQMP
 	bool "Support Xilinx ZynqMP Platform"
diff --git a/arch/arm/dts/zynq-7000.dtsi b/arch/arm/dts/zynq-7000.dtsi
index 668f54e..2464830 100644
--- a/arch/arm/dts/zynq-7000.dtsi
+++ b/arch/arm/dts/zynq-7000.dtsi
@@ -250,12 +250,14 @@ 
 		};
 
 		slcr: slcr@f8000000 {
+			u-boot,dm-pre-reloc;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			compatible = "xlnx,zynq-slcr", "syscon", "simple-mfd";
 			reg = <0xF8000000 0x1000>;
 			ranges;
 			clkc: clkc@100 {
+				u-boot,dm-pre-reloc;
 				#clock-cells = <1>;
 				compatible = "xlnx,ps7-clkc";
 				fclk-enable = <0>;
diff --git a/arch/arm/mach-zynq/clk.c b/arch/arm/mach-zynq/clk.c
index 570ebd7..7283a94 100644
--- a/arch/arm/mach-zynq/clk.c
+++ b/arch/arm/mach-zynq/clk.c
@@ -4,77 +4,13 @@ 
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
+#include <clk.h>
 #include <common.h>
-#include <errno.h>
-#include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <dm.h>
 #include <asm/arch/clk.h>
 
-/* Board oscillator frequency */
-#ifndef CONFIG_ZYNQ_PS_CLK_FREQ
-# define CONFIG_ZYNQ_PS_CLK_FREQ	33333333UL
-#endif
-
-/* Register bitfield defines */
-#define PLLCTRL_FBDIV_MASK	0x7f000
-#define PLLCTRL_FBDIV_SHIFT	12
-#define PLLCTRL_BPFORCE_MASK	(1 << 4)
-#define PLLCTRL_PWRDWN_MASK	2
-#define PLLCTRL_PWRDWN_SHIFT	1
-#define PLLCTRL_RESET_MASK	1
-#define PLLCTRL_RESET_SHIFT	0
-
-#define ZYNQ_CLK_MAXDIV		0x3f
-#define CLK_CTRL_DIV1_SHIFT	20
-#define CLK_CTRL_DIV1_MASK	(ZYNQ_CLK_MAXDIV << CLK_CTRL_DIV1_SHIFT)
-#define CLK_CTRL_DIV0_SHIFT	8
-#define CLK_CTRL_DIV0_MASK	(ZYNQ_CLK_MAXDIV << CLK_CTRL_DIV0_SHIFT)
-#define CLK_CTRL_SRCSEL_SHIFT	4
-#define CLK_CTRL_SRCSEL_MASK	(0x3 << CLK_CTRL_SRCSEL_SHIFT)
-
-#define CLK_CTRL_DIV2X_SHIFT	26
-#define CLK_CTRL_DIV2X_MASK	(ZYNQ_CLK_MAXDIV << CLK_CTRL_DIV2X_SHIFT)
-#define CLK_CTRL_DIV3X_SHIFT	20
-#define CLK_CTRL_DIV3X_MASK	(ZYNQ_CLK_MAXDIV << CLK_CTRL_DIV3X_SHIFT)
-
-#define ZYNQ_CLKMUX_SEL_0	0
-#define ZYNQ_CLKMUX_SEL_1	1
-#define ZYNQ_CLKMUX_SEL_2	2
-#define ZYNQ_CLKMUX_SEL_3	3
-
 DECLARE_GLOBAL_DATA_PTR;
 
-struct clk;
-
-/**
- * struct zynq_clk_ops:
- * @set_rate:	Function pointer to set_rate() implementation
- * @get_rate:	Function pointer to get_rate() implementation
- */
-struct zynq_clk_ops {
-	int (*set_rate)(struct clk *clk, unsigned long rate);
-	unsigned long (*get_rate)(struct clk *clk);
-};
-
-/**
- * struct clk:
- * @frequency:	Currenct frequency
- * @parent:	Parent clock
- * @flags:	Clock flags
- * @reg:	Clock control register
- * @ops:	Clock operations
- */
-struct clk {
-	unsigned long	frequency;
-	enum zynq_clk	parent;
-	unsigned int	flags;
-	u32		*reg;
-	struct zynq_clk_ops	ops;
-};
-#define ZYNQ_CLK_FLAGS_HAS_2_DIVS	1
-
-static struct clk clks[clk_max];
-
 static const char * const clk_names[clk_max] = {
 	"armpll", "ddrpll", "iopll",
 	"cpu_6or4x", "cpu_3or2x", "cpu_2x", "cpu_1x",
@@ -90,548 +26,43 @@  static const char * const clk_names[clk_max] = {
 };
 
 /**
- * __zynq_clk_cpu_get_parent() - Decode clock multiplexer
- * @srcsel:	Mux select value
- * Returns the clock identifier associated with the selected mux input.
- */
-static int __zynq_clk_cpu_get_parent(unsigned int srcsel)
-{
-	unsigned int ret;
-
-	switch (srcsel) {
-	case ZYNQ_CLKMUX_SEL_0:
-	case ZYNQ_CLKMUX_SEL_1:
-		ret = armpll_clk;
-		break;
-	case ZYNQ_CLKMUX_SEL_2:
-		ret = ddrpll_clk;
-		break;
-	case ZYNQ_CLKMUX_SEL_3:
-		ret = iopll_clk;
-		break;
-	default:
-		ret = armpll_clk;
-		break;
-	}
-
-	return ret;
-}
-
-/**
- * ddr2x_get_rate() - Get clock rate of DDR2x clock
- * @clk:	Clock handle
- * Returns the current clock rate of @clk.
- */
-static unsigned long ddr2x_get_rate(struct clk *clk)
-{
-	u32 clk_ctrl = readl(clk->reg);
-	u32 div = (clk_ctrl & CLK_CTRL_DIV2X_MASK) >> CLK_CTRL_DIV2X_SHIFT;
-
-	return DIV_ROUND_CLOSEST(zynq_clk_get_rate(clk->parent), div);
-}
-
-/**
- * ddr3x_get_rate() - Get clock rate of DDR3x clock
- * @clk:	Clock handle
- * Returns the current clock rate of @clk.
- */
-static unsigned long ddr3x_get_rate(struct clk *clk)
-{
-	u32 clk_ctrl = readl(clk->reg);
-	u32 div = (clk_ctrl & CLK_CTRL_DIV3X_MASK) >> CLK_CTRL_DIV3X_SHIFT;
-
-	return DIV_ROUND_CLOSEST(zynq_clk_get_rate(clk->parent), div);
-}
-
-static void init_ddr_clocks(void)
-{
-	u32 div0, div1;
-	unsigned long prate = zynq_clk_get_rate(ddrpll_clk);
-	u32 clk_ctrl = readl(&slcr_base->ddr_clk_ctrl);
-
-	/* DDR2x */
-	clks[ddr2x_clk].reg = &slcr_base->ddr_clk_ctrl;
-	clks[ddr2x_clk].parent = ddrpll_clk;
-	clks[ddr2x_clk].frequency = ddr2x_get_rate(&clks[ddr2x_clk]);
-	clks[ddr2x_clk].ops.get_rate = ddr2x_get_rate;
-
-	/* DDR3x */
-	clks[ddr3x_clk].reg = &slcr_base->ddr_clk_ctrl;
-	clks[ddr3x_clk].parent = ddrpll_clk;
-	clks[ddr3x_clk].frequency = ddr3x_get_rate(&clks[ddr3x_clk]);
-	clks[ddr3x_clk].ops.get_rate = ddr3x_get_rate;
-
-	/* DCI */
-	clk_ctrl = readl(&slcr_base->dci_clk_ctrl);
-	div0 = (clk_ctrl & CLK_CTRL_DIV0_MASK) >> CLK_CTRL_DIV0_SHIFT;
-	div1 = (clk_ctrl & CLK_CTRL_DIV1_MASK) >> CLK_CTRL_DIV1_SHIFT;
-	clks[dci_clk].reg = &slcr_base->dci_clk_ctrl;
-	clks[dci_clk].parent = ddrpll_clk;
-	clks[dci_clk].frequency = DIV_ROUND_CLOSEST(
-			DIV_ROUND_CLOSEST(prate, div0), div1);
-
-	gd->bd->bi_ddr_freq = clks[ddr3x_clk].frequency / 1000000;
-}
-
-static void init_cpu_clocks(void)
-{
-	int clk_621;
-	u32 reg, div, srcsel;
-	enum zynq_clk parent;
-
-	reg = readl(&slcr_base->arm_clk_ctrl);
-	clk_621 = readl(&slcr_base->clk_621_true) & 1;
-	div = (reg & CLK_CTRL_DIV0_MASK) >> CLK_CTRL_DIV0_SHIFT;
-	srcsel = (reg & CLK_CTRL_SRCSEL_MASK) >> CLK_CTRL_SRCSEL_SHIFT;
-	parent = __zynq_clk_cpu_get_parent(srcsel);
-
-	/* cpu clocks */
-	clks[cpu_6or4x_clk].reg = &slcr_base->arm_clk_ctrl;
-	clks[cpu_6or4x_clk].parent = parent;
-	clks[cpu_6or4x_clk].frequency = DIV_ROUND_CLOSEST(
-			zynq_clk_get_rate(parent), div);
-
-	clks[cpu_3or2x_clk].reg = &slcr_base->arm_clk_ctrl;
-	clks[cpu_3or2x_clk].parent = cpu_6or4x_clk;
-	clks[cpu_3or2x_clk].frequency = zynq_clk_get_rate(cpu_6or4x_clk) / 2;
-
-	clks[cpu_2x_clk].reg = &slcr_base->arm_clk_ctrl;
-	clks[cpu_2x_clk].parent = cpu_6or4x_clk;
-	clks[cpu_2x_clk].frequency = zynq_clk_get_rate(cpu_6or4x_clk) /
-			(2 + clk_621);
-
-	clks[cpu_1x_clk].reg = &slcr_base->arm_clk_ctrl;
-	clks[cpu_1x_clk].parent = cpu_6or4x_clk;
-	clks[cpu_1x_clk].frequency = zynq_clk_get_rate(cpu_6or4x_clk) /
-			(4 + 2 * clk_621);
-}
-
-/**
- * periph_calc_two_divs() - Calculate clock dividers
- * @cur_rate:	Current clock rate
- * @tgt_rate:	Target clock rate
- * @prate:	Parent clock rate
- * @div0:	First divider (output)
- * @div1:	Second divider (output)
- * Returns the actual clock rate possible.
- *
- * Calculates clock dividers for clocks with two 6-bit dividers.
- */
-static unsigned long periph_calc_two_divs(unsigned long cur_rate,
-		unsigned long tgt_rate, unsigned long prate, u32 *div0,
-		u32 *div1)
-{
-	long err, best_err = (long)(~0UL >> 1);
-	unsigned long rate, best_rate = 0;
-	u32 d0, d1;
-
-	for (d0 = 1; d0 <= ZYNQ_CLK_MAXDIV; d0++) {
-		for (d1 = 1; d1 <= ZYNQ_CLK_MAXDIV >> 1; d1++) {
-			rate = DIV_ROUND_CLOSEST(DIV_ROUND_CLOSEST(prate, d0),
-					d1);
-			err = abs(rate - tgt_rate);
-
-			if (err < best_err) {
-				*div0 = d0;
-				*div1 = d1;
-				best_err = err;
-				best_rate = rate;
-			}
-		}
-	}
-
-	return best_rate;
-}
-
-/**
- * zynq_clk_periph_set_rate() - Set clock rate
- * @clk:	Handle of the peripheral clock
- * @rate:	New clock rate
- * Sets the clock frequency of @clk to @rate. Returns zero on success.
- */
-static int zynq_clk_periph_set_rate(struct clk *clk,
-		unsigned long rate)
-{
-	u32 ctrl, div0 = 0, div1 = 0;
-	unsigned long prate, new_rate, cur_rate = clk->frequency;
-
-	ctrl = readl(clk->reg);
-	prate = zynq_clk_get_rate(clk->parent);
-	ctrl &= ~CLK_CTRL_DIV0_MASK;
-
-	if (clk->flags & ZYNQ_CLK_FLAGS_HAS_2_DIVS) {
-		ctrl &= ~CLK_CTRL_DIV1_MASK;
-		new_rate = periph_calc_two_divs(cur_rate, rate, prate, &div0,
-				&div1);
-		ctrl |= div1 << CLK_CTRL_DIV1_SHIFT;
-	} else {
-		div0 = DIV_ROUND_CLOSEST(prate, rate);
-		div0 &= ZYNQ_CLK_MAXDIV;
-		new_rate = DIV_ROUND_CLOSEST(rate, div0);
-	}
-
-	/* write new divs to hardware */
-	ctrl |= div0 << CLK_CTRL_DIV0_SHIFT;
-	writel(ctrl, clk->reg);
-
-	/* update frequency in clk framework */
-	clk->frequency = new_rate;
-
-	return 0;
-}
-
-/**
- * zynq_clk_periph_get_rate() - Get clock rate
- * @clk:	Handle of the peripheral clock
- * Returns the current clock rate of @clk.
- */
-static unsigned long zynq_clk_periph_get_rate(struct clk *clk)
-{
-	u32 clk_ctrl = readl(clk->reg);
-	u32 div0 = (clk_ctrl & CLK_CTRL_DIV0_MASK) >> CLK_CTRL_DIV0_SHIFT;
-	u32 div1 = 1;
-
-	if (clk->flags & ZYNQ_CLK_FLAGS_HAS_2_DIVS)
-		div1 = (clk_ctrl & CLK_CTRL_DIV1_MASK) >> CLK_CTRL_DIV1_SHIFT;
-
-	/* a register value of zero == division by 1 */
-	if (!div0)
-		div0 = 1;
-	if (!div1)
-		div1 = 1;
-
-	return
-		DIV_ROUND_CLOSEST(
-			DIV_ROUND_CLOSEST(zynq_clk_get_rate(clk->parent), div0),
-			div1);
-}
-
-/**
- * __zynq_clk_periph_get_parent() - Decode clock multiplexer
- * @srcsel:	Mux select value
- * Returns the clock identifier associated with the selected mux input.
- */
-static enum zynq_clk __zynq_clk_periph_get_parent(u32 srcsel)
-{
-	switch (srcsel) {
-	case ZYNQ_CLKMUX_SEL_0:
-	case ZYNQ_CLKMUX_SEL_1:
-		return iopll_clk;
-	case ZYNQ_CLKMUX_SEL_2:
-		return armpll_clk;
-	case ZYNQ_CLKMUX_SEL_3:
-		return ddrpll_clk;
-	default:
-		return 0;
-	}
-}
-
-/**
- * zynq_clk_periph_get_parent() - Decode clock multiplexer
- * @clk:	Clock handle
- * Returns the clock identifier associated with the selected mux input.
- */
-static enum zynq_clk zynq_clk_periph_get_parent(struct clk *clk)
-{
-	u32 clk_ctrl = readl(clk->reg);
-	u32 srcsel = (clk_ctrl & CLK_CTRL_SRCSEL_MASK) >> CLK_CTRL_SRCSEL_SHIFT;
-
-	return __zynq_clk_periph_get_parent(srcsel);
-}
-
-/**
- * zynq_clk_register_periph_clk() - Set up a peripheral clock with the framework
- * @clk:	Pointer to struct clk for the clock
- * @ctrl:	Clock control register
- * @two_divs:	Indicates whether the clock features one or two dividers
- */
-static int zynq_clk_register_periph_clk(struct clk *clk, u32 *ctrl,
-		bool two_divs)
-{
-	clk->reg = ctrl;
-	if (two_divs)
-		clk->flags = ZYNQ_CLK_FLAGS_HAS_2_DIVS;
-	clk->parent = zynq_clk_periph_get_parent(clk);
-	clk->frequency = zynq_clk_periph_get_rate(clk);
-	clk->ops.get_rate = zynq_clk_periph_get_rate;
-	clk->ops.set_rate = zynq_clk_periph_set_rate;
-
-	return 0;
-}
-
-static void init_periph_clocks(void)
-{
-	zynq_clk_register_periph_clk(&clks[gem0_clk],
-				     &slcr_base->gem0_clk_ctrl, 1);
-	zynq_clk_register_periph_clk(&clks[gem1_clk],
-				     &slcr_base->gem1_clk_ctrl, 1);
-
-	zynq_clk_register_periph_clk(&clks[smc_clk],
-				     &slcr_base->smc_clk_ctrl, 0);
-
-	zynq_clk_register_periph_clk(&clks[lqspi_clk],
-				     &slcr_base->lqspi_clk_ctrl, 0);
-
-	zynq_clk_register_periph_clk(&clks[sdio0_clk],
-				     &slcr_base->sdio_clk_ctrl, 0);
-	zynq_clk_register_periph_clk(&clks[sdio1_clk],
-				     &slcr_base->sdio_clk_ctrl, 0);
-
-	zynq_clk_register_periph_clk(&clks[spi0_clk],
-				     &slcr_base->spi_clk_ctrl, 0);
-	zynq_clk_register_periph_clk(&clks[spi1_clk],
-				     &slcr_base->spi_clk_ctrl, 0);
-
-	zynq_clk_register_periph_clk(&clks[uart0_clk],
-				     &slcr_base->uart_clk_ctrl, 0);
-	zynq_clk_register_periph_clk(&clks[uart1_clk],
-				     &slcr_base->uart_clk_ctrl, 0);
-
-	zynq_clk_register_periph_clk(&clks[dbg_trc_clk],
-				     &slcr_base->dbg_clk_ctrl, 0);
-	zynq_clk_register_periph_clk(&clks[dbg_apb_clk],
-				     &slcr_base->dbg_clk_ctrl, 0);
-
-	zynq_clk_register_periph_clk(&clks[pcap_clk],
-				     &slcr_base->pcap_clk_ctrl, 0);
-
-	zynq_clk_register_periph_clk(&clks[fclk0_clk],
-				     &slcr_base->fpga0_clk_ctrl, 1);
-	zynq_clk_register_periph_clk(&clks[fclk1_clk],
-				     &slcr_base->fpga1_clk_ctrl, 1);
-	zynq_clk_register_periph_clk(&clks[fclk2_clk],
-				     &slcr_base->fpga2_clk_ctrl, 1);
-	zynq_clk_register_periph_clk(&clks[fclk3_clk],
-				     &slcr_base->fpga3_clk_ctrl, 1);
-}
-
-/**
- * zynq_clk_register_aper_clk() - Set up a APER clock with the framework
- * @clk:	Pointer to struct clk for the clock
- * @ctrl:	Clock control register
- */
-static void zynq_clk_register_aper_clk(struct clk *clk, u32 *ctrl)
-{
-	clk->reg = ctrl;
-	clk->parent = cpu_1x_clk;
-	clk->frequency = zynq_clk_get_rate(clk->parent);
-}
-
-static void init_aper_clocks(void)
-{
-	zynq_clk_register_aper_clk(&clks[usb0_aper_clk],
-				   &slcr_base->aper_clk_ctrl);
-	zynq_clk_register_aper_clk(&clks[usb1_aper_clk],
-				   &slcr_base->aper_clk_ctrl);
-
-	zynq_clk_register_aper_clk(&clks[gem0_aper_clk],
-				   &slcr_base->aper_clk_ctrl);
-	zynq_clk_register_aper_clk(&clks[gem1_aper_clk],
-				   &slcr_base->aper_clk_ctrl);
-
-	zynq_clk_register_aper_clk(&clks[sdio0_aper_clk],
-				   &slcr_base->aper_clk_ctrl);
-	zynq_clk_register_aper_clk(&clks[sdio1_aper_clk],
-				   &slcr_base->aper_clk_ctrl);
-
-	zynq_clk_register_aper_clk(&clks[spi0_aper_clk],
-				   &slcr_base->aper_clk_ctrl);
-	zynq_clk_register_aper_clk(&clks[spi1_aper_clk],
-				   &slcr_base->aper_clk_ctrl);
-
-	zynq_clk_register_aper_clk(&clks[can0_aper_clk],
-				   &slcr_base->aper_clk_ctrl);
-	zynq_clk_register_aper_clk(&clks[can1_aper_clk],
-				   &slcr_base->aper_clk_ctrl);
-
-	zynq_clk_register_aper_clk(&clks[i2c0_aper_clk],
-				   &slcr_base->aper_clk_ctrl);
-	zynq_clk_register_aper_clk(&clks[i2c1_aper_clk],
-				   &slcr_base->aper_clk_ctrl);
-
-	zynq_clk_register_aper_clk(&clks[uart0_aper_clk],
-				   &slcr_base->aper_clk_ctrl);
-	zynq_clk_register_aper_clk(&clks[uart1_aper_clk],
-				   &slcr_base->aper_clk_ctrl);
-
-	zynq_clk_register_aper_clk(&clks[gpio_aper_clk],
-				   &slcr_base->aper_clk_ctrl);
-
-	zynq_clk_register_aper_clk(&clks[lqspi_aper_clk],
-				   &slcr_base->aper_clk_ctrl);
-
-	zynq_clk_register_aper_clk(&clks[smc_aper_clk],
-				   &slcr_base->aper_clk_ctrl);
-}
-
-/**
- * __zynq_clk_pll_get_rate() - Get PLL rate
- * @addr:	Address of the PLL's control register
- * Returns the current PLL output rate.
- */
-static unsigned long __zynq_clk_pll_get_rate(u32 *addr)
-{
-	u32 reg, mul, bypass;
-
-	reg = readl(addr);
-	bypass = reg & PLLCTRL_BPFORCE_MASK;
-	if (bypass)
-		mul = 1;
-	else
-		mul = (reg & PLLCTRL_FBDIV_MASK) >> PLLCTRL_FBDIV_SHIFT;
-
-	return CONFIG_ZYNQ_PS_CLK_FREQ * mul;
-}
-
-/**
- * zynq_clk_pll_get_rate() - Get PLL rate
- * @pll:	Handle of the PLL
- * Returns the current clock rate of @pll.
- */
-static unsigned long zynq_clk_pll_get_rate(struct clk *pll)
-{
-	return __zynq_clk_pll_get_rate(pll->reg);
-}
-
-/**
- * zynq_clk_register_pll() - Set up a PLL with the framework
- * @clk:	Pointer to struct clk for the PLL
- * @ctrl:	PLL control register
- * @prate:	PLL input clock rate
- */
-static void zynq_clk_register_pll(struct clk *clk, u32 *ctrl,
-		unsigned long prate)
-{
-	clk->reg = ctrl;
-	clk->frequency = zynq_clk_pll_get_rate(clk);
-	clk->ops.get_rate = zynq_clk_pll_get_rate;
-}
-
-/**
- * clkid_2_register() - Get clock control register
- * @id:	Clock identifier of one of the PLLs
- * Returns the address of the requested PLL's control register.
- */
-static u32 *clkid_2_register(enum zynq_clk id)
-{
-	switch (id) {
-	case armpll_clk:
-		return &slcr_base->arm_pll_ctrl;
-	case ddrpll_clk:
-		return &slcr_base->ddr_pll_ctrl;
-	case iopll_clk:
-		return &slcr_base->io_pll_ctrl;
-	default:
-		return &slcr_base->io_pll_ctrl;
-	}
-}
-
-/* API */
-/**
- * zynq_clk_early_init() - Early init for the clock framework
- *
- * This function is called from before relocation and sets up the CPU clock
- * frequency in the global data struct.
- */
-void zynq_clk_early_init(void)
-{
-	u32 reg = readl(&slcr_base->arm_clk_ctrl);
-	u32 div = (reg & CLK_CTRL_DIV0_MASK) >> CLK_CTRL_DIV0_SHIFT;
-	u32 srcsel = (reg & CLK_CTRL_SRCSEL_MASK) >> CLK_CTRL_SRCSEL_SHIFT;
-	enum zynq_clk parent = __zynq_clk_cpu_get_parent(srcsel);
-	u32 *pllreg = clkid_2_register(parent);
-	unsigned long prate = __zynq_clk_pll_get_rate(pllreg);
-
-	if (!div)
-		div = 1;
-
-	gd->cpu_clk = DIV_ROUND_CLOSEST(prate, div);
-}
-
-/**
- * get_uart_clk() - Get UART input frequency
- * @dev_index:	UART ID
- * Returns UART input clock frequency in Hz.
- *
- * Compared to zynq_clk_get_rate() this function is designed to work before
- * relocation and can be called when the serial UART is set up.
- */
-unsigned long get_uart_clk(int dev_index)
-{
-	u32 reg = readl(&slcr_base->uart_clk_ctrl);
-	u32 div = (reg & CLK_CTRL_DIV0_MASK) >> CLK_CTRL_DIV0_SHIFT;
-	u32 srcsel = (reg & CLK_CTRL_SRCSEL_MASK) >> CLK_CTRL_SRCSEL_SHIFT;
-	enum zynq_clk parent = __zynq_clk_periph_get_parent(srcsel);
-	u32 *pllreg = clkid_2_register(parent);
-	unsigned long prate = __zynq_clk_pll_get_rate(pllreg);
-
-	if (!div)
-		div = 1;
-
-	return DIV_ROUND_CLOSEST(prate, div);
-}
-
-/**
- * set_cpu_clk_info() - Initialize clock framework
- * Always returns zero.
+ * set_cpu_clk_info() - Setup clock information
  *
  * This function is called from common code after relocation and sets up the
- * clock framework. The framework must not be used before this function had been
- * called.
+ * clock information.
  */
 int set_cpu_clk_info(void)
 {
-	zynq_clk_register_pll(&clks[armpll_clk], &slcr_base->arm_pll_ctrl,
-			      CONFIG_ZYNQ_PS_CLK_FREQ);
-	zynq_clk_register_pll(&clks[ddrpll_clk], &slcr_base->ddr_pll_ctrl,
-			      CONFIG_ZYNQ_PS_CLK_FREQ);
-	zynq_clk_register_pll(&clks[iopll_clk], &slcr_base->io_pll_ctrl,
-			      CONFIG_ZYNQ_PS_CLK_FREQ);
-
-	init_ddr_clocks();
-	init_cpu_clocks();
-	init_periph_clocks();
-	init_aper_clocks();
-
-	gd->bd->bi_arm_freq = gd->cpu_clk / 1000000;
+	struct clk clk;
+	struct udevice *dev;
+	ulong rate;
+	int i, ret;
+
+	ret = uclass_get_device_by_driver(UCLASS_CLK,
+		DM_GET_DRIVER(zynq_clk), &dev);
+	if (ret)
+		return ret;
+
+	for (i = 0; i < 2; i++) {
+		clk.id = i ? ddr3x_clk : cpu_6or4x_clk;
+		ret = clk_request(dev, &clk);
+		if (ret < 0)
+			return ret;
+
+		rate = clk_get_rate(&clk) / 1000000;
+		if (i)
+			gd->bd->bi_ddr_freq = rate;
+		else
+			gd->bd->bi_arm_freq = rate;
+
+		clk_free(&clk);
+	}
 	gd->bd->bi_dsp_freq = 0;
 
 	return 0;
 }
 
 /**
- * zynq_clk_get_rate() - Get clock rate
- * @clk:	Clock identifier
- * Returns the current clock rate of @clk on success or zero for an invalid
- * clock id.
- */
-unsigned long zynq_clk_get_rate(enum zynq_clk clk)
-{
-	if (clk < 0 || clk >= clk_max)
-		return 0;
-
-	return clks[clk].frequency;
-}
-
-/**
- * zynq_clk_set_rate() - Set clock rate
- * @clk:	Clock identifier
- * @rate:	Requested clock rate
- * Passes on the return value from the clock's set_rate() function or negative
- * errno.
- */
-int zynq_clk_set_rate(enum zynq_clk clk, unsigned long rate)
-{
-	if (clk < 0 || clk >= clk_max)
-		return -ENODEV;
-
-	if (clks[clk].ops.set_rate)
-		return clks[clk].ops.set_rate(&clks[clk], rate);
-
-	return -ENXIO;
-}
-
-/**
  * soc_clk_dump() - Print clock frequencies
  * Returns zero on success
  *
@@ -639,13 +70,32 @@  int zynq_clk_set_rate(enum zynq_clk clk, unsigned long rate)
  */
 int soc_clk_dump(void)
 {
-	int i;
+	struct udevice *dev;
+	int i, ret;
+
+	ret = uclass_get_device_by_driver(UCLASS_CLK,
+		DM_GET_DRIVER(zynq_clk), &dev);
+	if (ret)
+		return ret;
 
 	printf("clk\t\tfrequency\n");
 	for (i = 0; i < clk_max; i++) {
 		const char *name = clk_names[i];
-		if (name)
-			printf("%10s%20lu\n", name, zynq_clk_get_rate(i));
+		if (name) {
+			struct clk clk;
+			unsigned long rate;
+
+			clk.id = i;
+			ret = clk_request(dev, &clk);
+			if (ret < 0)
+				return ret;
+
+			rate = clk_get_rate(&clk);
+
+			clk_free(&clk);
+
+			printf("%10s%20lu\n", name, rate);
+		}
 	}
 
 	return 0;
diff --git a/arch/arm/mach-zynq/cpu.c b/arch/arm/mach-zynq/cpu.c
index ba9171e..ee1c1a9 100644
--- a/arch/arm/mach-zynq/cpu.c
+++ b/arch/arm/mach-zynq/cpu.c
@@ -35,7 +35,6 @@  int arch_cpu_init(void)
 	writel(0xC, &slcr_base->ddr_urgent);
 #endif
 #endif
-	zynq_clk_early_init();
 	zynq_slcr_lock();
 
 	return 0;
diff --git a/arch/arm/mach-zynq/include/mach/clk.h b/arch/arm/mach-zynq/include/mach/clk.h
index 5c2758a..8a039ae 100644
--- a/arch/arm/mach-zynq/include/mach/clk.h
+++ b/arch/arm/mach-zynq/include/mach/clk.h
@@ -20,9 +20,4 @@  enum zynq_clk {
 	uart0_aper_clk, uart1_aper_clk, gpio_aper_clk, lqspi_aper_clk,
 	smc_aper_clk, swdt_clk, dbg_trc_clk, dbg_apb_clk, clk_max};
 
-void zynq_clk_early_init(void);
-int zynq_clk_set_rate(enum zynq_clk clk, unsigned long rate);
-unsigned long zynq_clk_get_rate(enum zynq_clk clk);
-unsigned long get_uart_clk(int dev_id);
-
 #endif
diff --git a/arch/arm/mach-zynq/include/mach/sys_proto.h b/arch/arm/mach-zynq/include/mach/sys_proto.h
index 44c9b50..67238e7 100644
--- a/arch/arm/mach-zynq/include/mach/sys_proto.h
+++ b/arch/arm/mach-zynq/include/mach/sys_proto.h
@@ -10,7 +10,6 @@ 
 extern void zynq_slcr_lock(void);
 extern void zynq_slcr_unlock(void);
 extern void zynq_slcr_cpu_reset(void);
-extern void zynq_slcr_gem_clk_setup(u32 gem_id, unsigned long clk_rate);
 extern void zynq_slcr_devcfg_disable(void);
 extern void zynq_slcr_devcfg_enable(void);
 extern u32 zynq_slcr_get_boot_mode(void);
diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c
index c1129cd..2a207ae 100644
--- a/arch/arm/mach-zynq/slcr.c
+++ b/arch/arm/mach-zynq/slcr.c
@@ -9,7 +9,6 @@ 
 #include <malloc.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/arch/clk.h>
 
 #define SLCR_LOCK_MAGIC		0x767B
 #define SLCR_UNLOCK_MAGIC	0xDF0D
@@ -124,27 +123,6 @@  void zynq_slcr_cpu_reset(void)
 	writel(1, &slcr_base->pss_rst_ctrl);
 }
 
-/* Setup clk for network */
-void zynq_slcr_gem_clk_setup(u32 gem_id, unsigned long clk_rate)
-{
-	int ret;
-
-	zynq_slcr_unlock();
-
-	if (gem_id > 1) {
-		printf("Non existing GEM id %d\n", gem_id);
-		goto out;
-	}
-
-	ret = zynq_clk_set_rate(gem0_clk + gem_id, clk_rate);
-	if (ret)
-		goto out;
-
-	udelay(100000);
-out:
-	zynq_slcr_lock();
-}
-
 void zynq_slcr_devcfg_disable(void)
 {
 	u32 reg_val;
diff --git a/arch/arm/mach-zynq/timer.c b/arch/arm/mach-zynq/timer.c
index 0335cbe..b1bb3b8 100644
--- a/arch/arm/mach-zynq/timer.c
+++ b/arch/arm/mach-zynq/timer.c
@@ -61,7 +61,6 @@  int timer_init(void)
 			(TIMER_PRESCALE << SCUTIMER_CONTROL_PRESCALER_SHIFT) |
 			SCUTIMER_CONTROL_ENABLE_MASK;
 
-#if defined(CONFIG_CLK) || defined(CONFIG_SPL_CLK)
 	struct udevice *dev;
 	struct clk clk;
 	int ret;
@@ -79,7 +78,6 @@  int timer_init(void)
 	gd->cpu_clk = clk_get_rate(&clk);
 
 	clk_free(&clk);
-#endif
 
 	gd->arch.timer_rate_hz = (gd->cpu_clk / 2) / (TIMER_PRESCALE + 1);
 
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index 9118e49..2c95188 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -181,9 +181,7 @@  struct zynq_gem_priv {
 	struct phy_device *phydev;
 	int phy_of_handle;
 	struct mii_dev *bus;
-#if defined(CONFIG_CLK) || defined(CONFIG_SPL_CLK)
 	struct clk tx_clk;
-#endif
 };
 
 static inline int mdio_wait(struct zynq_gem_regs *regs)
@@ -368,9 +366,7 @@  static int zynq_gem_init(struct udevice *dev)
 	u32 i, nwconfig;
 	int ret;
 	unsigned long clk_rate = 0;
-#if defined(CONFIG_CLK) || defined(CONFIG_SPL_CLK)
 	unsigned long clk_rate_rounded;
-#endif
 	struct zynq_gem_priv *priv = dev_get_priv(dev);
 	struct zynq_gem_regs *regs = priv->iobase;
 	struct emac_bd *dummy_tx_bd = &priv->tx_bd[TX_FREE_DESC];
@@ -473,7 +469,6 @@  static int zynq_gem_init(struct udevice *dev)
 		break;
 	}
 
-#if defined(CONFIG_CLK) || defined(CONFIG_SPL_CLK)
 	clk_rate_rounded = clk_set_rate(&priv->tx_clk, clk_rate);
 	if (IS_ERR_VALUE(clk_rate_rounded)) {
 		dev_err(dev, "failed to set tx clock rate\n");
@@ -485,10 +480,6 @@  static int zynq_gem_init(struct udevice *dev)
 		dev_err(dev, "failed to enable tx clock\n");
 		return ret;
 	}
-#else
-	zynq_slcr_gem_clk_setup((ulong)priv->iobase !=
-				ZYNQ_GEM_BASEADDR0, clk_rate);
-#endif
 
 	setbits_le32(&regs->nwctrl, ZYNQ_GEM_NWCTRL_RXEN_MASK |
 					ZYNQ_GEM_NWCTRL_TXEN_MASK);
@@ -699,9 +690,7 @@  static int zynq_gem_ofdata_to_platdata(struct udevice *dev)
 	struct eth_pdata *pdata = dev_get_platdata(dev);
 	struct zynq_gem_priv *priv = dev_get_priv(dev);
 	const char *phy_mode;
-#if defined(CONFIG_CLK) || defined(CONFIG_SPL_CLK)
 	int ret;
-#endif
 
 	pdata->iobase = (phys_addr_t)dev_get_addr(dev);
 	priv->iobase = (struct zynq_gem_regs *)pdata->iobase;
@@ -723,13 +712,11 @@  static int zynq_gem_ofdata_to_platdata(struct udevice *dev)
 	}
 	priv->interface = pdata->phy_interface;
 
-#if defined(CONFIG_CLK) || defined(CONFIG_SPL_CLK)
 	ret = clk_get_by_index(dev, 2, &priv->tx_clk);
 	if (ret < 0) {
 		dev_err(dev, "failed to get clock\n");
 		return ret;
 	}
-#endif
 
 	printf("ZYNQ GEM: %lx, phyaddr %x, interface %s\n", (ulong)priv->iobase,
 	       priv->phyaddr, phy_string_for_interface(priv->interface));
diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c
index 4f6e7e4..a2967c0 100644
--- a/drivers/serial/serial_zynq.c
+++ b/drivers/serial/serial_zynq.c
@@ -15,7 +15,6 @@ 
 #include <asm/io.h>
 #include <linux/compiler.h>
 #include <serial.h>
-#include <asm/arch/clk.h>
 #include <asm/arch/hardware.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -111,7 +110,6 @@  int zynq_serial_setbrg(struct udevice *dev, int baudrate)
 	struct zynq_uart_priv *priv = dev_get_priv(dev);
 	unsigned long clock;
 
-#if defined(CONFIG_CLK) || defined(CONFIG_SPL_CLK)
 	int ret;
 	struct clk clk;
 
@@ -133,9 +131,7 @@  int zynq_serial_setbrg(struct udevice *dev, int baudrate)
 		dev_err(dev, "failed to enable clock\n");
 		return ret;
 	}
-#else
-	clock = get_uart_clk(0);
-#endif
+
 	_uart_zynq_serial_setbrg(priv->regs, clock, baudrate);
 
 	return 0;
diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h
index 3b0fa29..a1ccc42 100644
--- a/include/configs/topic_miami.h
+++ b/include/configs/topic_miami.h
@@ -10,8 +10,6 @@ 
 #ifndef __CONFIG_TOPIC_MIAMI_H
 #define __CONFIG_TOPIC_MIAMI_H
 
-#define CONFIG_ZYNQ_PS_CLK_FREQ		33333333UL
-
 #define CONFIG_ZYNQ_I2C0
 #define CONFIG_ZYNQ_I2C1
 
diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h
index b9ff391..1488fd8 100644
--- a/include/configs/zynq_zybo.h
+++ b/include/configs/zynq_zybo.h
@@ -20,9 +20,6 @@ 
 #define CONFIG_DISPLAY
 #define CONFIG_I2C_EDID
 
-/* Define ZYBO PS Clock Frequency to 50MHz */
-#define CONFIG_ZYNQ_PS_CLK_FREQ	50000000UL
-
 #include <configs/zynq-common.h>
 
 #endif /* __CONFIG_ZYNQ_ZYBO_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 6d614c6..375b9b8 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -8248,7 +8248,6 @@  CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET
 CONFIG_ZYNQ_HISPD_BROKEN
 CONFIG_ZYNQ_I2C0
 CONFIG_ZYNQ_I2C1
-CONFIG_ZYNQ_PS_CLK_FREQ
 CONFIG_ZYNQ_SDHCI0
 CONFIG_ZYNQ_SDHCI1
 CONFIG_ZYNQ_SDHCI_MAX_FREQ