X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=arch%2Farm%2Finclude%2Fasm%2Farch-omap4%2Fsys_proto.h;h=c9f0b3a14b560e897a7e3ae2517d93242a94156d;hb=edb697cfcc2dda02c5b2a34b3157b8fa8fc01264;hp=bae0db79c044f0c671c208b215d44da09a6021ec;hpb=7cb998ba8569ec108fcc415a32e39ec6d825ad68;p=u-boot

diff --git a/arch/arm/include/asm/arch-omap4/sys_proto.h b/arch/arm/include/asm/arch-omap4/sys_proto.h
index bae0db79c0..c9f0b3a14b 100644
--- a/arch/arm/include/asm/arch-omap4/sys_proto.h
+++ b/arch/arm/include/asm/arch-omap4/sys_proto.h
@@ -30,6 +30,13 @@ extern const struct dmm_lisa_map_regs ma_lisa_map_2G_x_2_x_2;
 extern const struct lpddr2_device_details elpida_2G_S4_details;
 extern const struct lpddr2_device_details elpida_4G_S4_details;
 #endif
+
+#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
+
 struct omap_sysinfo {
 	char *board_string;
 };
@@ -39,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);