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/cpu/armv7/omap-common/vc.c | |
parent | 74ae612fd8cfeb55f663bdd565d3f9d73703b2c4 (diff) | |
parent | 68cd4a4c9f4d7be8dc95796fb567f6b03faf9d97 (diff) |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/cpu/armv7/omap-common/vc.c')
-rw-r--r-- | arch/arm/cpu/armv7/omap-common/vc.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/vc.c b/arch/arm/cpu/armv7/omap-common/vc.c index e6e5f7893c..a68f1d145d 100644 --- a/arch/arm/cpu/armv7/omap-common/vc.c +++ b/arch/arm/cpu/armv7/omap-common/vc.c @@ -17,6 +17,7 @@ #include <common.h> #include <asm/omap_common.h> #include <asm/arch/sys_proto.h> +#include <asm/arch/clock.h> /* * Define Master code if there are multiple masters on the I2C_SR bus. @@ -57,7 +58,7 @@ * omap_vc_init() - Initialization for Voltage controller * @speed_khz: I2C buspeed in KHz */ -void omap_vc_init(u16 speed_khz) +static void omap_vc_init(u16 speed_khz) { u32 val; u32 sys_clk_khz, cycles_hi, cycles_low; @@ -137,3 +138,14 @@ int omap_vc_bypass_send_value(u8 sa, u8 reg_addr, u8 reg_data) /* All good.. */ return 0; } + +void sri2c_init(void) +{ + static int sri2c = 1; + + if (sri2c) { + omap_vc_init(PRM_VC_I2C_CHANNEL_FREQ_KHZ); + sri2c = 0; + } + return; +} |