diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-10 18:28:37 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-10 18:28:37 +0200 |
| commit | 1b83470f3c2eeae398cf90831f96c8ba4ed675fa (patch) | |
| tree | 39bcf8beb8722bfe9cacbb3310cd5571f1e0b720 /arch/arm/include/asm/arch-omap4/sys_proto.h | |
| parent | 74ae612fd8cfeb55f663bdd565d3f9d73703b2c4 (diff) | |
| parent | 68cd4a4c9f4d7be8dc95796fb567f6b03faf9d97 (diff) | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/include/asm/arch-omap4/sys_proto.h')
| -rw-r--r-- | arch/arm/include/asm/arch-omap4/sys_proto.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/include/asm/arch-omap4/sys_proto.h b/arch/arm/include/asm/arch-omap4/sys_proto.h index ef85594bd2..e413466148 100644 --- a/arch/arm/include/asm/arch-omap4/sys_proto.h +++ b/arch/arm/include/asm/arch-omap4/sys_proto.h @@ -22,7 +22,7 @@ #define _SYS_PROTO_H_ #include <asm/arch/omap.h> -#include <asm/arch/clocks.h> +#include <asm/arch/clock.h> #include <asm/io.h> #include <asm/omap_common.h> #include <asm/arch/mux_omap4.h> @@ -57,7 +57,8 @@ u32 cortex_rev(void); void save_omap_boot_params(void); void init_omap_revision(void); void do_io_settings(void); -void omap_vc_init(u16 speed_khz); +void sri2c_init(void); +void gpi2c_init(void); int omap_vc_bypass_send_value(u8 sa, u8 reg_addr, u8 reg_data); u32 warm_reset(void); void force_emif_self_refresh(void); |