diff options
| author | Tom Rini <trini@konsulko.com> | 2018-11-14 18:25:34 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-11-14 18:25:34 -0500 |
| commit | 6f443330186676004148930b4dd77f1c2735bd36 (patch) | |
| tree | f1cc00c2b5210e7bd13f527b0698bfeaf783ac86 /arch/arm/mach-sunxi | |
| parent | 208ecbad2ea83333e8f3c9933213867addf16f4a (diff) | |
| parent | 7d121a8ea4e0dbf0d7e105b57c3dbd7d8bd2e729 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'arch/arm/mach-sunxi')
| -rw-r--r-- | arch/arm/mach-sunxi/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-sunxi/clock_sun6i.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index 6277abc3cc..560dc9b25d 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -278,6 +278,7 @@ config MACH_SUN50I select ARM64 select DM_I2C select PHY_SUN4I_USB + select SUN6I_PRCM select SUNXI_DE2 select SUNXI_GEN_SUN6I select SUPPORT_SPL diff --git a/arch/arm/mach-sunxi/clock_sun6i.c b/arch/arm/mach-sunxi/clock_sun6i.c index 82f6f7f8e3..1628f3a7b6 100644 --- a/arch/arm/mach-sunxi/clock_sun6i.c +++ b/arch/arm/mach-sunxi/clock_sun6i.c @@ -149,7 +149,11 @@ void clock_set_pll3(unsigned int clk) { struct sunxi_ccm_reg * const ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE; +#ifdef CONFIG_SUNXI_DE2 + const int m = 4; /* 6 MHz steps to allow higher frequency for DE2 */ +#else const int m = 8; /* 3 MHz steps just like sun4i, sun5i and sun7i */ +#endif if (clk == 0) { clrbits_le32(&ccm->pll3_cfg, CCM_PLL3_CTRL_EN); |