diff options
| author | Tom Rini <trini@konsulko.com> | 2017-04-06 12:28:03 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-06 20:40:24 -0400 |
| commit | d53ecad92f06d2e38a5cbc13af7473867c7fa277 (patch) | |
| tree | cd46314f18a4e1b538a7973f1b74935f4ca2b096 /arch/arm/mach-sunxi/clock_sun6i.c | |
| parent | 891f7ae63318293cd5807fb611f86f545080b1f6 (diff) | |
| parent | e7bd15ea156f2a65d6aba167b9b7cd711caae2e6 (diff) | |
| download | u-boot-d53ecad92f06d2e38a5cbc13af7473867c7fa277.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
trini: Disable CONFIG_SPL_USE_ARCH_MEMSET on orangepi_2
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/mach-sunxi/clock_sun6i.c')
| -rw-r--r-- | arch/arm/mach-sunxi/clock_sun6i.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-sunxi/clock_sun6i.c b/arch/arm/mach-sunxi/clock_sun6i.c index d123b3acb2..4762fbf0c3 100644 --- a/arch/arm/mach-sunxi/clock_sun6i.c +++ b/arch/arm/mach-sunxi/clock_sun6i.c @@ -22,7 +22,7 @@ void clock_init_safe(void) struct sunxi_ccm_reg * const ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE; -#if !defined(CONFIG_MACH_SUN8I_H3) && !defined(CONFIG_MACH_SUN50I) +#if !defined(CONFIG_MACH_SUNXI_H3_H5) && !defined(CONFIG_MACH_SUN50I) struct sunxi_prcm_reg * const prcm = (struct sunxi_prcm_reg *)SUNXI_PRCM_BASE; @@ -51,7 +51,7 @@ void clock_init_safe(void) void clock_init_sec(void) { -#ifdef CONFIG_MACH_SUN8I_H3 +#ifdef CONFIG_MACH_SUNXI_H3_H5 struct sunxi_ccm_reg * const ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE; @@ -152,7 +152,7 @@ void clock_set_pll5(unsigned int clk, bool sigma_delta_enable) const int max_n = 32; int k = 1, m = 2; -#ifdef CONFIG_MACH_SUN8I_H3 +#ifdef CONFIG_MACH_SUNXI_H3_H5 clrsetbits_le32(&ccm->pll5_tuning_cfg, CCM_PLL5_TUN_LOCK_TIME_MASK | CCM_PLL5_TUN_INIT_FREQ_MASK, CCM_PLL5_TUN_LOCK_TIME(2) | CCM_PLL5_TUN_INIT_FREQ(16)); |