mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-10-04 02:20:43 +09:00
Merge branch 'master' of git://git.denx.de/u-boot-i2c
This commit is contained in:
commit
8c8dc4c615
@ -73,7 +73,7 @@ static void i2c_board_init(struct mv_i2c *base)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_I2C_MULTI_BUS
|
#ifdef CONFIG_I2C_MULTI_BUS
|
||||||
static u32 i2c_regs[CONFIG_MV_I2C_NUM] = CONFIG_MV_I2C_REG;
|
static unsigned long i2c_regs[CONFIG_MV_I2C_NUM] = CONFIG_MV_I2C_REG;
|
||||||
static unsigned int bus_initialized[CONFIG_MV_I2C_NUM];
|
static unsigned int bus_initialized[CONFIG_MV_I2C_NUM];
|
||||||
static unsigned int current_bus;
|
static unsigned int current_bus;
|
||||||
|
|
||||||
|
@ -228,13 +228,14 @@ static int twsi_stop(int status)
|
|||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
static unsigned int twsi_calc_freq(const int n, const int m)
|
||||||
* Ugly formula to convert m and n values to a frequency comes from
|
{
|
||||||
* TWSI specifications
|
#ifdef CONFIG_SUNXI
|
||||||
*/
|
return CONFIG_SYS_TCLK / (10 * (m + 1) * (1 << n));
|
||||||
|
#else
|
||||||
#define TWSI_FREQUENCY(m, n) \
|
return CONFIG_SYS_TCLK / (10 * (m + 1) * (2 << n));
|
||||||
(CONFIG_SYS_TCLK / (10 * (m + 1) * (1 << n)))
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Reset controller.
|
* Reset controller.
|
||||||
@ -266,7 +267,7 @@ static unsigned int twsi_i2c_set_bus_speed(struct i2c_adapter *adap,
|
|||||||
/* compute m, n setting for highest speed not above requested speed */
|
/* compute m, n setting for highest speed not above requested speed */
|
||||||
for (n = 0; n < 8; n++) {
|
for (n = 0; n < 8; n++) {
|
||||||
for (m = 0; m < 16; m++) {
|
for (m = 0; m < 16; m++) {
|
||||||
tmp_speed = TWSI_FREQUENCY(m, n);
|
tmp_speed = twsi_calc_freq(n, m);
|
||||||
if ((tmp_speed <= requested_speed)
|
if ((tmp_speed <= requested_speed)
|
||||||
&& (tmp_speed > highest_speed)) {
|
&& (tmp_speed > highest_speed)) {
|
||||||
highest_speed = tmp_speed;
|
highest_speed = tmp_speed;
|
||||||
|
Loading…
Reference in New Issue
Block a user