summaryrefslogtreecommitdiffstats
path: root/arch/arm/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-06-12 12:52:33 -0400
committerTom Rini <trini@konsulko.com>2016-06-12 12:52:33 -0400
commit672a45e828039c20e5165af95623554bdc31862d (patch)
tree5d79e136c39e99d79da470abe309c350c1ece289 /arch/arm/include
parentb10335009667fee493fbce59bbeb0504d0ca9ff0 (diff)
parent1a83fb4a17d959d7b037999ab7ed7e62429abe34 (diff)
downloadtalos-obmc-uboot-672a45e828039c20e5165af95623554bdc31862d.tar.gz
talos-obmc-uboot-672a45e828039c20e5165af95623554bdc31862d.zip
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/arch-sunxi/clock_sun6i.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h
index f2990db928..c2e72f5a86 100644
--- a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h
+++ b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h
@@ -222,7 +222,12 @@ struct sunxi_ccm_reg {
#define CCM_PLL11_CTRL_UPD (0x1 << 30)
#define CCM_PLL11_CTRL_EN (0x1 << 31)
+#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 */
+#else
#define AHB1_ABP1_DIV_DEFAULT 0x00003180 /* AHB1=PLL6/3,APB1=AHB1/2 */
+#endif
#define AXI_GATE_OFFSET_DRAM 0
OpenPOWER on IntegriCloud