diff options
author | Tom Rini <trini@konsulko.com> | 2016-08-26 14:58:52 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-08-26 17:05:01 -0400 |
commit | c6b968da78ce3fa7224c0ddf15fe170c7c05b27e (patch) | |
tree | 42716ddc52ec9caecc19588a2d0c5ca9a94188dd /arch/arm/include/asm/arch-sunxi/clock_sun6i.h | |
parent | 1cfce74fe5a2301ee9b384d9395ba95db930c9d6 (diff) | |
parent | d5ac6eef91965b519d8f15f17febfa0ea2ee0adc (diff) | |
download | u-boot-imx-c6b968da78ce3fa7224c0ddf15fe170c7c05b27e.zip u-boot-imx-c6b968da78ce3fa7224c0ddf15fe170c7c05b27e.tar.gz u-boot-imx-c6b968da78ce3fa7224c0ddf15fe170c7c05b27e.tar.bz2 |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'arch/arm/include/asm/arch-sunxi/clock_sun6i.h')
-rw-r--r-- | arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h index d4dff1e..be9fcfd 100644 --- a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h +++ b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h @@ -116,7 +116,9 @@ struct sunxi_ccm_reg { u32 mipi_bias_cfg; /* 0x240 MIPI Bias config */ u32 pll9_bias_cfg; /* 0x244 PLL9 Bias config */ u32 pll10_bias_cfg; /* 0x248 PLL10 Bias config */ - u32 reserved21[13]; + u32 reserved21[5]; + u32 pll5_tuning_cfg; /* 0x260 PLL5 Tuning config */ + u32 reserved21_5[7]; u32 pll1_pattern_cfg; /* 0x280 PLL1 Pattern config */ u32 pll2_pattern_cfg; /* 0x284 PLL2 Pattern config */ u32 pll3_pattern_cfg; /* 0x288 PLL3 Pattern config */ @@ -223,6 +225,11 @@ struct sunxi_ccm_reg { #define CCM_PLL11_CTRL_UPD (0x1 << 30) #define CCM_PLL11_CTRL_EN (0x1 << 31) +#define CCM_PLL5_TUN_LOCK_TIME(x) (((x) & 0x7) << 24) +#define CCM_PLL5_TUN_LOCK_TIME_MASK CCM_PLL5_TUN_LOCK_TIME(0x7) +#define CCM_PLL5_TUN_INIT_FREQ(x) (((x) & 0x7f) << 16) +#define CCM_PLL5_TUN_INIT_FREQ_MASK CCM_PLL5_TUN_INIT_FREQ(0x7f) + #if defined(CONFIG_MACH_SUN50I) /* AHB1=100MHz failsafe setup from the FEL mode, usable with PMIC defaults */ #define AHB1_ABP1_DIV_DEFAULT 0x00003190 /* AHB1=PLL6/6,APB1=AHB1/2 */ |