mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-01 17:10:11 +00:00
f9d1324775
Most clock factors and dividers in the H6 PLLs use a "+1 encoding", which we were missing on two occasions. This fixes the MMC clock setup on the H6, which could be slightly off due to the wrong parent frequency: mmc 2 set mod-clk req 52000000 parent 1176000000 n 2 m 12 rate 49000000 Also the CPU frequency (PLL1) was a tad too high before. For PLL5 (DRAM) we already accounted for this +1, but in the DRAM code itself, not in the bit field macro. Move this there to be aligned with what the other SoCs and other PLLs do. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com>
132 lines
3.3 KiB
C
132 lines
3.3 KiB
C
#include <common.h>
|
|
#include <asm/io.h>
|
|
#include <asm/arch/cpu.h>
|
|
#include <asm/arch/clock.h>
|
|
#include <asm/arch/prcm.h>
|
|
|
|
#ifdef CONFIG_SPL_BUILD
|
|
void clock_init_safe(void)
|
|
{
|
|
struct sunxi_ccm_reg *const ccm =
|
|
(struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
|
|
|
|
/* this seems to enable PLLs on H616 */
|
|
if (IS_ENABLED(CONFIG_MACH_SUN50I_H616))
|
|
setbits_le32(SUNXI_PRCM_BASE + 0x250, 0x10);
|
|
|
|
clock_set_pll1(408000000);
|
|
|
|
writel(CCM_PLL6_DEFAULT, &ccm->pll6_cfg);
|
|
while (!(readl(&ccm->pll6_cfg) & CCM_PLL6_LOCK))
|
|
;
|
|
|
|
clrsetbits_le32(&ccm->cpu_axi_cfg, CCM_CPU_AXI_APB_MASK | CCM_CPU_AXI_AXI_MASK,
|
|
CCM_CPU_AXI_DEFAULT_FACTORS);
|
|
|
|
writel(CCM_PSI_AHB1_AHB2_DEFAULT, &ccm->psi_ahb1_ahb2_cfg);
|
|
writel(CCM_AHB3_DEFAULT, &ccm->ahb3_cfg);
|
|
writel(CCM_APB1_DEFAULT, &ccm->apb1_cfg);
|
|
|
|
/*
|
|
* The mux and factor are set, but the clock will be enabled in
|
|
* DRAM initialization code.
|
|
*/
|
|
writel(MBUS_CLK_SRC_PLL6X2 | MBUS_CLK_M(3), &ccm->mbus_cfg);
|
|
}
|
|
#endif
|
|
|
|
void clock_init_uart(void)
|
|
{
|
|
struct sunxi_ccm_reg *const ccm =
|
|
(struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
|
|
|
|
/* uart clock source is apb2 */
|
|
writel(APB2_CLK_SRC_OSC24M|
|
|
APB2_CLK_RATE_N_1|
|
|
APB2_CLK_RATE_M(1),
|
|
&ccm->apb2_cfg);
|
|
|
|
/* open the clock for uart */
|
|
setbits_le32(&ccm->uart_gate_reset,
|
|
1 << (CONFIG_CONS_INDEX - 1));
|
|
|
|
/* deassert uart reset */
|
|
setbits_le32(&ccm->uart_gate_reset,
|
|
1 << (RESET_SHIFT + CONFIG_CONS_INDEX - 1));
|
|
}
|
|
|
|
#ifdef CONFIG_SPL_BUILD
|
|
void clock_set_pll1(unsigned int clk)
|
|
{
|
|
struct sunxi_ccm_reg * const ccm =
|
|
(struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
|
|
u32 val;
|
|
|
|
/* Do not support clocks < 288MHz as they need factor P */
|
|
if (clk < 288000000) clk = 288000000;
|
|
|
|
/* Switch to 24MHz clock while changing PLL1 */
|
|
val = readl(&ccm->cpu_axi_cfg);
|
|
val &= ~CCM_CPU_AXI_MUX_MASK;
|
|
val |= CCM_CPU_AXI_MUX_OSC24M;
|
|
writel(val, &ccm->cpu_axi_cfg);
|
|
|
|
/* clk = 24*n/p, p is ignored if clock is >288MHz */
|
|
writel(CCM_PLL1_CTRL_EN | CCM_PLL1_LOCK_EN | CCM_PLL1_CLOCK_TIME_2 |
|
|
#ifdef CONFIG_MACH_SUN50I_H616
|
|
CCM_PLL1_OUT_EN |
|
|
#endif
|
|
CCM_PLL1_CTRL_N(clk / 24000000), &ccm->pll1_cfg);
|
|
while (!(readl(&ccm->pll1_cfg) & CCM_PLL1_LOCK)) {}
|
|
|
|
/* Switch CPU to PLL1 */
|
|
val = readl(&ccm->cpu_axi_cfg);
|
|
val &= ~CCM_CPU_AXI_MUX_MASK;
|
|
val |= CCM_CPU_AXI_MUX_PLL_CPUX;
|
|
writel(val, &ccm->cpu_axi_cfg);
|
|
}
|
|
#endif
|
|
|
|
unsigned int clock_get_pll6(void)
|
|
{
|
|
struct sunxi_ccm_reg *const ccm =
|
|
(struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
|
|
int m = IS_ENABLED(CONFIG_MACH_SUN50I_H6) ? 4 : 2;
|
|
|
|
uint32_t rval = readl(&ccm->pll6_cfg);
|
|
int n = ((rval & CCM_PLL6_CTRL_N_MASK) >> CCM_PLL6_CTRL_N_SHIFT) + 1;
|
|
int div1 = ((rval & CCM_PLL6_CTRL_DIV1_MASK) >>
|
|
CCM_PLL6_CTRL_DIV1_SHIFT) + 1;
|
|
int div2 = ((rval & CCM_PLL6_CTRL_DIV2_MASK) >>
|
|
CCM_PLL6_CTRL_DIV2_SHIFT) + 1;
|
|
/* The register defines PLL6-2X or PLL6-4X, not plain PLL6 */
|
|
return 24000000 / m * n / div1 / div2;
|
|
}
|
|
|
|
int clock_twi_onoff(int port, int state)
|
|
{
|
|
struct sunxi_ccm_reg *const ccm =
|
|
(struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
|
|
struct sunxi_prcm_reg *const prcm =
|
|
(struct sunxi_prcm_reg *)SUNXI_PRCM_BASE;
|
|
u32 value, *ptr;
|
|
int shift;
|
|
|
|
value = BIT(GATE_SHIFT) | BIT (RESET_SHIFT);
|
|
|
|
if (port == 5) {
|
|
shift = 0;
|
|
ptr = &prcm->twi_gate_reset;
|
|
} else {
|
|
shift = port;
|
|
ptr = &ccm->twi_gate_reset;
|
|
}
|
|
|
|
/* set the apb clock gate and reset for twi */
|
|
if (state)
|
|
setbits_le32(ptr, value << shift);
|
|
else
|
|
clrbits_le32(ptr, value << shift);
|
|
|
|
return 0;
|
|
}
|