mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-19 05:31:32 +00:00
Merge git://git.denx.de/u-boot-i2c
This commit is contained in:
commit
60a53351fb
1 changed files with 4 additions and 1 deletions
|
@ -487,11 +487,14 @@ static uint __twsi_i2c_set_bus_speed(struct mvtwsi_registers *twsi,
|
||||||
static void __twsi_i2c_init(struct mvtwsi_registers *twsi, int speed,
|
static void __twsi_i2c_init(struct mvtwsi_registers *twsi, int speed,
|
||||||
int slaveadd, uint *actual_speed)
|
int slaveadd, uint *actual_speed)
|
||||||
{
|
{
|
||||||
|
uint tmp_speed;
|
||||||
|
|
||||||
/* Reset controller */
|
/* Reset controller */
|
||||||
twsi_reset(twsi);
|
twsi_reset(twsi);
|
||||||
/* Set speed */
|
/* Set speed */
|
||||||
|
tmp_speed = __twsi_i2c_set_bus_speed(twsi, speed);
|
||||||
if (actual_speed)
|
if (actual_speed)
|
||||||
*actual_speed = __twsi_i2c_set_bus_speed(twsi, speed);
|
*actual_speed = tmp_speed;
|
||||||
/* Set slave address; even though we don't use it */
|
/* Set slave address; even though we don't use it */
|
||||||
writel(slaveadd, &twsi->slave_address);
|
writel(slaveadd, &twsi->slave_address);
|
||||||
writel(0, &twsi->xtnd_slave_addr);
|
writel(0, &twsi->xtnd_slave_addr);
|
||||||
|
|
Loading…
Add table
Reference in a new issue