summaryrefslogtreecommitdiff
path: root/arch/mips/mach-ath79/ar934x/ddr.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-05-31 10:26:14 -0400
committerTom Rini <trini@konsulko.com>2016-05-31 10:26:14 -0400
commitda6e2fab5db000e31187aa4c9495c244011792c1 (patch)
tree6ae6a6ce2ad21c15e0cc560275f676e2aeb42767 /arch/mips/mach-ath79/ar934x/ddr.c
parent653bb0d92eefb7255c88a8a251a3dbabec9345b6 (diff)
parentf1b65c98b0a134ce92c38141b917fd3a210ee535 (diff)
downloadu-boot-imx-da6e2fab5db000e31187aa4c9495c244011792c1.zip
u-boot-imx-da6e2fab5db000e31187aa4c9495c244011792c1.tar.gz
u-boot-imx-da6e2fab5db000e31187aa4c9495c244011792c1.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mips
Diffstat (limited to 'arch/mips/mach-ath79/ar934x/ddr.c')
-rw-r--r--arch/mips/mach-ath79/ar934x/ddr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/mach-ath79/ar934x/ddr.c b/arch/mips/mach-ath79/ar934x/ddr.c
index 4621d58..2ba1efa 100644
--- a/arch/mips/mach-ath79/ar934x/ddr.c
+++ b/arch/mips/mach-ath79/ar934x/ddr.c
@@ -11,7 +11,7 @@
#include <asm/addrspace.h>
#include <asm/types.h>
#include <mach/ar71xx_regs.h>
-#include <mach/reset.h>
+#include <mach/ath79.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -45,7 +45,7 @@ void ar934x_ddr_init(const u16 cpu_mhz, const u16 ddr_mhz, const u16 ahb_mhz)
ddr_regs = map_physmem(AR71XX_DDR_CTRL_BASE, AR71XX_DDR_CTRL_SIZE,
MAP_NOCACHE);
- reg = get_bootstrap();
+ reg = ath79_get_bootstrap();
if (reg & AR934X_BOOTSTRAP_SDRAM_DISABLED) { /* DDR */
if (reg & AR934X_BOOTSTRAP_DDR1) { /* DDR 1 */
memtype = AR934X_DDR1;