Merge branch 'master' of git://git.denx.de/u-boot-socfpga

[u-boot] / arch / arm / include / asm / arch-omap4 / sys_proto.h

diff --git a/arch/arm/include/asm/arch-omap4/sys_proto.h b/arch/arm/include/asm/arch-omap4/sys_proto.h
index 5fa1cf8144b916c90be7dc3b4503f1c585a354e6..c9f0b3a14b560e897a7e3ae2517d93242a94156d 100644 (file)
--- a/arch/arm/include/asm/arch-omap4/sys_proto.h
+++ b/arch/arm/include/asm/arch-omap4/sys_proto.h
@@ -31,7 +31,9 @@ extern const struct lpddr2_device_details elpida_2G_S4_details;
 extern const struct lpddr2_device_details elpida_4G_S4_details;
 #endif
 
-#ifndef CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
+#ifdef CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
+extern const struct lpddr2_device_timings jedec_default_timings;
+#else
 extern const struct lpddr2_device_timings elpida_2G_S4_timings;
 #endif
 
@@ -44,7 +46,7 @@ void gpmc_init(void);
 void watchdog_init(void);
 u32 get_device_type(void);
 void do_set_mux(u32 base, struct pad_conf_entry const *array, int size);
-void set_muxconf_regs_essential(void);
+void set_muxconf_regs(void);
 u32 wait_on_value(u32, u32, void *, u32);
 void sdelay(unsigned long);
 void setup_early_clocks(void);