]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - arch/arm/cpu/armv7/am33xx/clock.c
am33xx: Update DT files, add am335x_gp_evm_config target
[karo-tx-uboot.git] / arch / arm / cpu / armv7 / am33xx / clock.c
index dcdf951037253a07d511069fcece2da9a52a4d7a..ec7d46838b74770b1a284cd4a2a72085506a5725 100644 (file)
 /*
  * clock.c
  *
- * clocks for AM33XX based boards
+ * Clock initialization for AM33XX boards.
+ * Derived from OMAP4 boards
  *
- * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
+ * Copyright (C) 2013, Texas Instruments, Incorporated - http://www.ti.com/
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR /PURPOSE.  See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier:    GPL-2.0+
  */
-
 #include <common.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/hardware.h>
+#include <asm/arch/sys_proto.h>
 #include <asm/io.h>
 
-#define PRCM_MOD_EN            0x2
-#define PRCM_FORCE_WAKEUP      0x2
-#define PRCM_FUNCTL            0x0
-
-#define PRCM_EMIF_CLK_ACTIVITY BIT(2)
-#define PRCM_L3_GCLK_ACTIVITY  BIT(4)
-
-#define PLL_BYPASS_MODE                0x4
-#define ST_MN_BYPASS           0x00000100
-#define ST_DPLL_CLK            0x00000001
-#define CLK_SEL_MASK           0x7ffff
-#define CLK_DIV_MASK           0x1f
-#define CLK_DIV2_MASK          0x7f
-#define CLK_SEL_SHIFT          0x8
-#define CLK_MODE_MASK          0x7
-#define CLK_MODE_SEL           0x7
-#define DPLL_CLKDCOLDO_GATE_CTRL 0x300
-
-
-const struct cm_perpll *cmper = (struct cm_perpll *)CM_PER;
-const struct cm_wkuppll *cmwkup = (struct cm_wkuppll *)CM_WKUP;
-const struct cm_dpll *cmdpll = (struct cm_dpll *)CM_DPLL;
-const struct cm_rtc *cmrtc = (struct cm_rtc *)CM_RTC;
-
-#ifdef CONFIG_SPL_BUILD
-#define enable_clk(reg, val) __enable_clk(#reg, &reg, val)
-
-static void __enable_clk(const char *name, const void *reg, u32 mask)
+static void setup_post_dividers(const struct dpll_regs *dpll_regs,
+                        const struct dpll_params *params)
 {
-       unsigned long timeout = 10000000;
-
-       writel(mask, reg);
-       while (readl(reg) != mask)
-               /* poor man's timeout, since timers not initialized */
-               if (timeout-- == 0)
-                       /* no error message, since console not yet available */
-                       break;
+       /* Setup post-dividers */
+       if (params->m2 >= 0)
+               writel(params->m2, dpll_regs->cm_div_m2_dpll);
+       if (params->m3 >= 0)
+               writel(params->m3, dpll_regs->cm_div_m3_dpll);
+       if (params->m4 >= 0)
+               writel(params->m4, dpll_regs->cm_div_m4_dpll);
+       if (params->m5 >= 0)
+               writel(params->m5, dpll_regs->cm_div_m5_dpll);
+       if (params->m6 >= 0)
+               writel(params->m6, dpll_regs->cm_div_m6_dpll);
 }
 
-static void enable_interface_clocks(void)
+static inline void do_lock_dpll(const struct dpll_regs *dpll_regs)
 {
-       /* Enable all the Interconnect Modules */
-       enable_clk(cmper->l3clkctrl, PRCM_MOD_EN);
-       enable_clk(cmper->l4lsclkctrl, PRCM_MOD_EN);
-       enable_clk(cmper->l4fwclkctrl, PRCM_MOD_EN);
-       enable_clk(cmwkup->wkl4wkclkctrl, PRCM_MOD_EN);
-       enable_clk(cmper->l3instrclkctrl, PRCM_MOD_EN);
-       enable_clk(cmper->l4hsclkctrl, PRCM_MOD_EN);
-#ifdef CONFIG_HW_WATCHDOG
-       enable_clk(cmwkup->wdtimer1ctrl, PRCM_MOD_EN);
-#endif
-       /* GPIO0 */
-       enable_clk(cmwkup->wkgpio0clkctrl, PRCM_MOD_EN);
+       clrsetbits_le32(dpll_regs->cm_clkmode_dpll,
+                       CM_CLKMODE_DPLL_DPLL_EN_MASK,
+                       DPLL_EN_LOCK << CM_CLKMODE_DPLL_EN_SHIFT);
 }
 
-/*
- * Force power domain wake up transition
- * Ensure that the corresponding interface clock is active before
- * using the peripheral
- */
-static void power_domain_wkup_transition(void)
+static inline void wait_for_lock(const struct dpll_regs *dpll_regs)
 {
-       writel(PRCM_FORCE_WAKEUP, &cmper->l3clkstctrl);
-       writel(PRCM_FORCE_WAKEUP, &cmper->l4lsclkstctrl);
-       writel(PRCM_FORCE_WAKEUP, &cmwkup->wkclkstctrl);
-       writel(PRCM_FORCE_WAKEUP, &cmper->l4fwclkstctrl);
-       writel(PRCM_FORCE_WAKEUP, &cmper->l3sclkstctrl);
+       if (!wait_on_value(ST_DPLL_CLK_MASK, ST_DPLL_CLK_MASK,
+                          (void *)dpll_regs->cm_idlest_dpll, LDELAY)) {
+               printf("DPLL locking failed for 0x%x\n",
+                      dpll_regs->cm_clkmode_dpll);
+               hang();
+       }
 }
 
-/*
- * Enable the peripheral clock for required peripherals
- */
-static void enable_per_clocks(void)
+static inline void do_bypass_dpll(const struct dpll_regs *dpll_regs)
 {
-       /* Enable the control module though RBL would have done it*/
-       enable_clk(cmwkup->wkctrlclkctrl, PRCM_MOD_EN);
-       /* Enable the timer2 clock */
-       enable_clk(cmper->timer2clkctrl, PRCM_MOD_EN);
-       /* Select the Master osc 24 MHZ as Timer2 clock source */
-       writel(0x1, &cmdpll->clktimer2clk);
-
-#ifdef CONFIG_SYS_NS16550_COM1
-       /* UART0 */
-       enable_clk(cmwkup->wkup_uart0ctrl, PRCM_MOD_EN);
-#endif
-#ifdef CONFIG_SYS_NS16550_COM2
-       enable_clk(cmper->uart1clkctrl, PRCM_MOD_EN);
-#endif
-#ifdef CONFIG_SYS_NS16550_COM3
-       enable_clk(cmper->uart2clkctrl, PRCM_MOD_EN);
-#endif
-#ifdef CONFIG_SYS_NS16550_COM4
-       enable_clk(cmper->uart3clkctrl, PRCM_MOD_EN);
-#endif
-#ifdef CONFIG_SYS_NS16550_COM5
-       enable_clk(cmper->uart4clkctrl, PRCM_MOD_EN);
-#endif
-#ifdef CONFIG_SYS_NS16550_COM6
-       enable_clk(cmper->uart5clkctrl, PRCM_MOD_EN);
-#endif
-       /* GPMC */
-       enable_clk(cmper->gpmcclkctrl, PRCM_MOD_EN);
-
-       /* ELM */
-       enable_clk(cmper->elmclkctrl, PRCM_MOD_EN);
-
-       /* Ethernet */
-       enable_clk(cmper->cpswclkstctrl, PRCM_MOD_EN);
-       enable_clk(cmper->cpgmac0clkctrl, PRCM_MOD_EN);
-
-       /* MMC */
-#ifndef CONFIG_OMAP_MMC_DEV_0
-       enable_clk(cmper->mmc0clkctrl, PRCM_MOD_EN);
-#endif
-#ifdef CONFIG_OMAP_MMC_DEV_1
-       enable_clk(cmper->mmc1clkctrl, PRCM_MOD_EN);
-#endif
-       /* LCD */
-       enable_clk(cmper->lcdclkctrl, PRCM_MOD_EN);
-
-       /* i2c0 */
-       enable_clk(cmwkup->wkup_i2c0ctrl, PRCM_MOD_EN);
-
-       /* GPIO1-3 */
-       enable_clk(cmper->gpio1clkctrl, PRCM_MOD_EN);
-       enable_clk(cmper->gpio2clkctrl, PRCM_MOD_EN);
-       enable_clk(cmper->gpio3clkctrl, PRCM_MOD_EN);
-
-       /* i2c1 */
-       enable_clk(cmper->i2c1clkctrl, PRCM_MOD_EN);
-
-       /* spi0 */
-       enable_clk(cmper->spi0clkctrl, PRCM_MOD_EN);
-
-       /* rtc */
-       enable_clk(cmrtc->rtcclkctrl, PRCM_MOD_EN);
-
-       /* usb0 */
-       enable_clk(cmper->usb0clkctrl, PRCM_MOD_EN);
+       clrsetbits_le32(dpll_regs->cm_clkmode_dpll,
+                       CM_CLKMODE_DPLL_DPLL_EN_MASK,
+                       DPLL_EN_MN_BYPASS << CM_CLKMODE_DPLL_EN_SHIFT);
 }
-#endif /* CONFIG_SPL_BUILD */
 
-void mpu_pll_config(int m)
+static inline void wait_for_bypass(const struct dpll_regs *dpll_regs)
 {
-       u32 clkmode, clksel, div_m2;
-
-       clkmode = readl(&cmwkup->clkmoddpllmpu);
-       clksel = readl(&cmwkup->clkseldpllmpu);
-       div_m2 = readl(&cmwkup->divm2dpllmpu);
-
-       /* Set the PLL to bypass Mode */
-       writel(PLL_BYPASS_MODE, &cmwkup->clkmoddpllmpu);
-       while (readl(&cmwkup->idlestdpllmpu) != ST_MN_BYPASS)
-               ;
-
-       clksel &= ~CLK_SEL_MASK;
-       clksel |= (m << CLK_SEL_SHIFT) | MPUPLL_N;
-       writel(clksel, &cmwkup->clkseldpllmpu);
-
-       div_m2 &= ~CLK_DIV_MASK;
-       div_m2 |= MPUPLL_M2;
-       writel(div_m2, &cmwkup->divm2dpllmpu);
-
-       clkmode &= ~CLK_MODE_MASK;
-       clkmode |= CLK_MODE_SEL;
-       writel(clkmode, &cmwkup->clkmoddpllmpu);
-
-       while (readl(&cmwkup->idlestdpllmpu) != ST_DPLL_CLK)
-               ;
+       if (!wait_on_value(ST_DPLL_CLK_MASK, 0,
+                          (void *)dpll_regs->cm_idlest_dpll, LDELAY)) {
+               printf("Bypassing DPLL failed 0x%x\n",
+                      dpll_regs->cm_clkmode_dpll);
+       }
 }
 
-static void core_pll_config(int m)
+static void bypass_dpll(const struct dpll_regs *dpll_regs)
 {
-       u32 clkmode, clksel, div_m4, div_m5, div_m6;
-
-       clkmode = readl(&cmwkup->clkmoddpllcore);
-       clksel = readl(&cmwkup->clkseldpllcore);
-       div_m4 = readl(&cmwkup->divm4dpllcore);
-       div_m5 = readl(&cmwkup->divm5dpllcore);
-       div_m6 = readl(&cmwkup->divm6dpllcore);
-
-       /* Set the PLL to bypass Mode */
-       writel(PLL_BYPASS_MODE, &cmwkup->clkmoddpllcore);
-
-       while (readl(&cmwkup->idlestdpllcore) != ST_MN_BYPASS)
-               ;
-
-       clksel &= ~CLK_SEL_MASK;
-       clksel |= ((m << CLK_SEL_SHIFT) | COREPLL_N);
-       writel(clksel, &cmwkup->clkseldpllcore);
-
-       div_m4 &= ~CLK_DIV_MASK;
-       div_m4 |= COREPLL_M4;
-       writel(div_m4, &cmwkup->divm4dpllcore);
-
-       div_m5 &= ~CLK_DIV_MASK;
-       div_m5 |= COREPLL_M5;
-       writel(div_m5, &cmwkup->divm5dpllcore);
-
-       div_m6 &= ~CLK_DIV_MASK;
-       div_m6 |= COREPLL_M6;
-       writel(div_m6, &cmwkup->divm6dpllcore);
-
-       clkmode &= ~CLK_MODE_MASK;
-       clkmode |= CLK_MODE_SEL;
-       writel(clkmode, &cmwkup->clkmoddpllcore);
-
-       while (readl(&cmwkup->idlestdpllcore) != ST_DPLL_CLK)
-               ;
+       do_bypass_dpll(dpll_regs);
+       wait_for_bypass(dpll_regs);
 }
 
-static void per_pll_config(int m)
+void do_setup_dpll(const struct dpll_regs *dpll_regs,
+                  const struct dpll_params *params)
 {
-       u32 clkmode, clksel, div_m2;
-
-       clkmode = readl(&cmwkup->clkmoddpllper);
-       clksel = readl(&cmwkup->clkseldpllper);
-       div_m2 = readl(&cmwkup->divm2dpllper);
+       u32 temp;
 
-       /* Set the PLL to bypass Mode */
-       writel(PLL_BYPASS_MODE, &cmwkup->clkmoddpllper);
+       if (!params)
+               return;
 
-       while (readl(&cmwkup->idlestdpllper) != ST_MN_BYPASS)
-               ;
+       temp = readl(dpll_regs->cm_clksel_dpll);
 
-       clksel &= ~CLK_SEL_MASK;
-       clksel |= (m << CLK_SEL_SHIFT) | PERPLL_N;
-       writel(clksel, &cmwkup->clkseldpllper);
+       bypass_dpll(dpll_regs);
 
-       div_m2 &= ~CLK_DIV2_MASK;
-       div_m2 |= PERPLL_M2;
-       writel(div_m2, &cmwkup->divm2dpllper);
+       /* Set M & N */
+       temp &= ~CM_CLKSEL_DPLL_M_MASK;
+       temp |= (params->m << CM_CLKSEL_DPLL_M_SHIFT) & CM_CLKSEL_DPLL_M_MASK;
 
-       clkmode &= ~CLK_MODE_MASK;
-       clkmode |= CLK_MODE_SEL;
-       writel(clkmode, &cmwkup->clkmoddpllper);
+       temp &= ~CM_CLKSEL_DPLL_N_MASK;
+       temp |= (params->n << CM_CLKSEL_DPLL_N_SHIFT) & CM_CLKSEL_DPLL_N_MASK;
 
-       while (readl(&cmwkup->idlestdpllper) != ST_DPLL_CLK)
-               ;
+       writel(temp, dpll_regs->cm_clksel_dpll);
 
-       writel(DPLL_CLKDCOLDO_GATE_CTRL, &cmwkup->clkdcoldodpllper);
-}
-
-static void disp_pll_config(int m)
-{
-       u32 clkmode, clksel, div_m2;
-
-       clkmode = readl(&cmwkup->clkmoddplldisp);
-       clksel = readl(&cmwkup->clkseldplldisp);
-       div_m2 = readl(&cmwkup->divm2dplldisp);
-
-       /* Set the PLL to bypass Mode */
-       writel(PLL_BYPASS_MODE, &cmwkup->clkmoddplldisp);
-
-       while (!(readl(&cmwkup->idlestdplldisp) & ST_MN_BYPASS))
-               ;
+       setup_post_dividers(dpll_regs, params);
 
-       clksel &= ~CLK_SEL_MASK;
-       clksel |= (m << CLK_SEL_SHIFT) | DISPPLL_N;
-       writel(clksel, &cmwkup->clkseldplldisp);
-
-       div_m2 &= ~CLK_DIV2_MASK;
-       div_m2 |= DISPPLL_M2;
-       writel(div_m2, &cmwkup->divm2dplldisp);
-
-       clkmode &= ~CLK_MODE_MASK;
-       clkmode |= CLK_MODE_SEL;
-       writel(clkmode, &cmwkup->clkmoddplldisp);
-
-       while (!(readl(&cmwkup->idlestdplldisp) & ST_DPLL_CLK))
-               ;
+       /* Wait till the DPLL locks */
+       do_lock_dpll(dpll_regs);
+       wait_for_lock(dpll_regs);
 }
 
-void ddr_pll_config(unsigned int ddrpll_m)
+static void setup_dplls(void)
 {
-       u32 clkmode, clksel, div_m2;
-
-       clkmode = readl(&cmwkup->clkmoddpllddr);
-       clksel = readl(&cmwkup->clkseldpllddr);
-       div_m2 = readl(&cmwkup->divm2dpllddr);
-
-       /* Set the PLL to bypass Mode */
-       clkmode &= ~CLK_MODE_MASK;
-       clkmode |= PLL_BYPASS_MODE;
-       writel(clkmode, &cmwkup->clkmoddpllddr);
+       const struct dpll_params *params;
 
-       /* Wait till bypass mode is enabled */
-       while (!(readl(&cmwkup->idlestdpllddr) & ST_MN_BYPASS))
-               ;
+       params = get_dpll_core_params();
+       do_setup_dpll(&dpll_core_regs, params);
 
-       clksel &= ~CLK_SEL_MASK;
-       clksel |= (ddrpll_m << CLK_SEL_SHIFT) | DDRPLL_N;
-       writel(clksel, &cmwkup->clkseldpllddr);
+       params = get_dpll_mpu_params();
+       do_setup_dpll(&dpll_mpu_regs, params);
 
-       div_m2 &= ~CLK_DIV_MASK;
-       div_m2 |= DDRPLL_M2;
-       writel(div_m2, &cmwkup->divm2dpllddr);
+       params = get_dpll_per_params();
+       do_setup_dpll(&dpll_per_regs, params);
+       writel(0x300, &cmwkup->clkdcoldodpllper);
 
-       clkmode &= ~CLK_MODE_MASK;
-       clkmode |= CLK_MODE_SEL;
-       writel(clkmode, &cmwkup->clkmoddpllddr);
-
-       /* Wait till dpll is locked */
-       while ((readl(&cmwkup->idlestdpllddr) & ST_DPLL_CLK) != ST_DPLL_CLK)
-               ;
+       params = get_dpll_ddr_params();
+       do_setup_dpll(&dpll_ddr_regs, params);
 }
 
-#ifdef CONFIG_SPL_BUILD
-void enable_emif_clocks(void)
-{
-       /* Enable the  EMIF_FW Functional clock */
-       writel(PRCM_MOD_EN, &cmper->emiffwclkctrl);
-       /* Enable EMIF0 Clock */
-       writel(PRCM_MOD_EN, &cmper->emifclkctrl);
-       /* Poll if module is functional */
-       while ((readl(&cmper->emifclkctrl)) != PRCM_MOD_EN)
-               ;
-}
-
-/*
- * Configure the PLL/PRCM for necessary peripherals
- */
-void pll_init()
+static inline void wait_for_clk_enable(u32 *clkctrl_addr)
 {
-       mpu_pll_config(MPUPLL_M);
-       core_pll_config(COREPLL_M);
-       per_pll_config(PERPLL_M);
-       disp_pll_config(DISPPLL_M);
-
-       /* Enable the required interconnect clocks */
-       enable_interface_clocks();
-
-       /* Power domain wake up transition */
-       power_domain_wkup_transition();
+       u32 clkctrl, idlest = MODULE_CLKCTRL_IDLEST_DISABLED;
+       u32 bound = LDELAY;
 
-       /* Enable the required peripherals */
-       enable_per_clocks();
+       while ((idlest == MODULE_CLKCTRL_IDLEST_DISABLED) ||
+               (idlest == MODULE_CLKCTRL_IDLEST_TRANSITIONING)) {
+               clkctrl = readl(clkctrl_addr);
+               idlest = (clkctrl & MODULE_CLKCTRL_IDLEST_MASK) >>
+                        MODULE_CLKCTRL_IDLEST_SHIFT;
+               if (--bound == 0) {
+                       printf("Clock enable failed for 0x%p idlest 0x%x\n",
+                              clkctrl_addr, clkctrl);
+                       return;
+               }
+       }
 }
-#endif
 
-#define M(mn) (((mn) & CLK_SEL_MASK) >> CLK_SEL_SHIFT)
-#define N(mn) ((mn) & CLK_DIV2_MASK)
-
-unsigned long __clk_get_rate(u32 m_n, u32 div_m2)
+static inline void enable_clock_module(u32 *const clkctrl_addr, u32 enable_mode,
+                                      u32 wait_for_enable)
 {
-       unsigned long rate;
-
-       div_m2 &= CLK_DIV_MASK;
-       debug("M=%u N=%u M2=%u\n", M(m_n), N(m_n), div_m2);
-       rate = V_OSCK / 1000 * M(m_n) / (N(m_n) + 1) / div_m2;
-       debug("CLK = %lu.%03luMHz\n", rate / 1000, rate % 1000);
-       return rate * 1000;
+       clrsetbits_le32(clkctrl_addr, MODULE_CLKCTRL_MODULEMODE_MASK,
+                       enable_mode << MODULE_CLKCTRL_MODULEMODE_SHIFT);
+       debug("Enable clock module - %p\n", clkctrl_addr);
+       if (wait_for_enable)
+               wait_for_clk_enable(clkctrl_addr);
 }
 
-unsigned long lcdc_clk_rate(void)
+static inline void enable_clock_domain(u32 *const clkctrl_reg, u32 enable_mode)
 {
-       return clk_get_rate(cmwkup, disp);
+       clrsetbits_le32(clkctrl_reg, CD_CLKCTRL_CLKTRCTRL_MASK,
+                       enable_mode << CD_CLKCTRL_CLKTRCTRL_SHIFT);
+       debug("Enable clock domain - %p\n", clkctrl_reg);
 }
 
-unsigned long mpu_clk_rate(void)
+void do_enable_clocks(u32 *const *clk_domains,
+                     u32 *const *clk_modules_explicit_en, u8 wait_for_enable)
 {
-       return clk_get_rate(cmwkup, mpu);
-}
-
-enum {
-       CLK_MPU_PLL,
-       CLK_CORE_PLL,
-       CLK_PER_PLL,
-       CLK_DISP_PLL,
-       CLK_GPMC,
-};
-
-static struct clk_lookup {
-       const char *name;
-       unsigned int index;
-} am33xx_clk_lookup[] = {
-       { "mpu", CLK_MPU_PLL, },
-       { "core", CLK_CORE_PLL, },
-       { "per", CLK_PER_PLL, },
-       { "lcdc", CLK_DISP_PLL, },
-       { "gpmc", CLK_GPMC, },
-};
+       u32 i, max = 100;
 
-#define print_pll(dom, pll) {                          \
-       u32 __pll = clk_get_rate(dom, pll);             \
-       printf("%-12s %4d.%03d MHz\n", #pll,            \
-               __pll / 1000000, __pll / 1000 % 1000);  \
+       /* Put the clock domains in SW_WKUP mode */
+       for (i = 0; (i < max) && clk_domains[i]; i++) {
+               enable_clock_domain(clk_domains[i],
+                                   CD_CLKCTRL_CLKTRCTRL_SW_WKUP);
        }
 
-#define print_pll2(dom, n, pll) {                      \
-       u32 __m_n = readl(&(dom)->clkseldpll##pll);     \
-       u32 __div = readl(&(dom)->divm##n##dpll##pll);  \
-       u32 __pll = __clk_get_rate(__m_n, __div);       \
-       printf("%-12s %4d.%03d MHz\n", #pll "_m" #n,    \
-               __pll / 1000000, __pll / 1000 % 1000);  \
-       }
+       /* Clock modules that need to be put in SW_EXPLICIT_EN mode */
+       for (i = 0; (i < max) && clk_modules_explicit_en[i]; i++) {
+               enable_clock_module(clk_modules_explicit_en[i],
+                                   MODULE_CLKCTRL_MODULEMODE_SW_EXPLICIT_EN,
+                                   wait_for_enable);
+       };
+}
 
-static void do_showclocks(void)
+/*
+ * Before scaling up the clocks we need to have the PMIC scale up the
+ * voltages first.  This will be dependent on which PMIC is in use
+ * and in some cases we may not be scaling things up at all and thus not
+ * need to do anything here.
+ */
+__weak void scale_vcores(void)
 {
-       print_pll(cmwkup, mpu);
-       print_pll2(cmwkup, 4, core);
-       print_pll2(cmwkup, 5, core);
-       print_pll2(cmwkup, 6, core);
-       print_pll(cmwkup, ddr);
-       print_pll(cmwkup, per);
-       print_pll(cmwkup, disp);
 }
 
-int do_clocks(cmd_tbl_t *cmdtp, int flag, int argc,
-       char *const argv[])
+void prcm_init()
 {
-       int i;
-       unsigned long freq;
-       unsigned long __attribute__((unused)) ref = ~0UL;
-
-       if (argc < 2) {
-               do_showclocks();
-               return CMD_RET_SUCCESS;
-       } else if (argc == 2 || argc > 4) {
-               return CMD_RET_USAGE;
-       }
-
-       freq = simple_strtoul(argv[2], NULL, 0);
-       if (freq < 1000) {
-               printf("Invalid clock frequency %lu\n", freq);
-               return CMD_RET_FAILURE;
-       }
-       if (argc > 3) {
-               ref = simple_strtoul(argv[3], NULL, 0);
-       }
-       for (i = 0; i < ARRAY_SIZE(am33xx_clk_lookup); i++) {
-               if (strcasecmp(argv[1], am33xx_clk_lookup[i].name) == 0) {
-                       switch (am33xx_clk_lookup[i].index) {
-                       case CLK_MPU_PLL:
-                               mpu_pll_config(freq / 1000000);
-                               break;
-                       case CLK_CORE_PLL:
-                               core_pll_config(freq / 1000000);
-                               break;
-                       case CLK_PER_PLL:
-                               per_pll_config(freq / 1000000);
-                               break;
-                       case CLK_DISP_PLL:
-                               disp_pll_config(freq / 1000000);
-                               break;
-                       default:
-                               printf("Cannot change %s clock\n",
-                                       am33xx_clk_lookup[i].name);
-                               return CMD_RET_FAILURE;
-                       }
-
-                       printf("%s clock set to %lu.%03lu MHz\n",
-                               am33xx_clk_lookup[i].name,
-                               freq / 1000000, freq / 1000 % 1000);
-                       return CMD_RET_SUCCESS;
-               }
-       }
-       if (i == ARRAY_SIZE(am33xx_clk_lookup)) {
-               printf("clock %s not found; supported clocks are:\n", argv[1]);
-               for (i = 0; i < ARRAY_SIZE(am33xx_clk_lookup); i++) {
-                       printf("\t%s\n", am33xx_clk_lookup[i].name);
-               }
-       } else {
-               printf("Failed to set clock %s to %s MHz\n",
-                       argv[1], argv[2]);
-       }
-       return CMD_RET_FAILURE;
+       enable_basic_clocks();
+       scale_vcores();
+       setup_dplls();
 }
-
-U_BOOT_CMD(
-       clocks, 4, 0, do_clocks,
-       "display/set clocks",
-       "                    - display clock settings\n"
-       "clocks <clkname> <freq>    - set clock <clkname> to <freq> Hz"
-);