riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

boards: efm32: adapt to new i2c interface.

Browse Source
This commit is contained in:
Bas Stottelaar 2018-05-27 21:45:07 +02:00 committed by dylad
parent e8a76acea5
commit 0541b5c449
6 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boards/common/silabs/drivers/pic/pic.c
View File

@ -61,8 +61,6 @@ void pic_init(void)
{ {
gpio_init(PIC_INT_WAKE_PIN, GPIO_OD); gpio_init(PIC_INT_WAKE_PIN, GPIO_OD);
gpio_set(PIC_INT_WAKE_PIN); gpio_set(PIC_INT_WAKE_PIN);
i2c_init_master(PIC_I2C, I2C_SPEED_NORMAL);
} }
void pic_write(uint8_t addr, uint8_t value) void pic_write(uint8_t addr, uint8_t value)
@ -74,7 +72,7 @@ void pic_write(uint8_t addr, uint8_t value)
/* write to gpio expander */ /* write to gpio expander */
i2c_acquire(PIC_I2C); i2c_acquire(PIC_I2C);
uint8_t bytes[] = { addr, value }; uint8_t bytes[] = { addr, value };
i2c_write_bytes(PIC_I2C, PIC_I2C_ADDR, bytes, 2); i2c_write_bytes(PIC_I2C, PIC_I2C_ADDR, bytes, 2, 0);
i2c_release(PIC_I2C); i2c_release(PIC_I2C);
/* put PIC in sleep mode again */ /* put PIC in sleep mode again */

3
boards/slstk3401a/include/periph_conf.h
View File

@ -96,7 +96,8 @@ static const i2c_conf_t i2c_config[] = {
.loc = I2C_ROUTELOC0_SDALOC_LOC15 | .loc = I2C_ROUTELOC0_SDALOC_LOC15 |
I2C_ROUTELOC0_SCLLOC_LOC15, I2C_ROUTELOC0_SCLLOC_LOC15,
.cmu = cmuClock_I2C0, .cmu = cmuClock_I2C0,
.irq = I2C0_IRQn .irq = I2C0_IRQn,
.speed = I2C_SPEED_NORMAL
} }
}; };

4
boards/sltb001a/include/periph_conf.h
View File

@ -96,8 +96,8 @@ static const i2c_conf_t i2c_config[] = {
.loc = I2C_ROUTELOC0_SDALOC_LOC15 | .loc = I2C_ROUTELOC0_SDALOC_LOC15 |
I2C_ROUTELOC0_SCLLOC_LOC15, I2C_ROUTELOC0_SCLLOC_LOC15,
.cmu = cmuClock_I2C0, .cmu = cmuClock_I2C0,
.irq = I2C0_IRQn .irq = I2C0_IRQn,
.speed = I2C_SPEED_NORMAL
} }
}; };

3
boards/slwstk6000b/include/periph_conf.h
View File

@ -98,7 +98,8 @@ static const i2c_conf_t i2c_config[] = {
.loc = I2C_ROUTELOC0_SDALOC_LOC16 | .loc = I2C_ROUTELOC0_SDALOC_LOC16 |
I2C_ROUTELOC0_SCLLOC_LOC14, I2C_ROUTELOC0_SCLLOC_LOC14,
.cmu = cmuClock_I2C0, .cmu = cmuClock_I2C0,
.irq = I2C0_IRQn .irq = I2C0_IRQn,
.speed = I2C_SPEED_NORMAL
} }
}; };

6
boards/stk3600/include/periph_conf.h
View File

@ -115,7 +115,8 @@ static const i2c_conf_t i2c_config[] = {
.scl_pin = GPIO_PIN(PD, 7), .scl_pin = GPIO_PIN(PD, 7),
.loc = I2C_ROUTE_LOCATION_LOC1, .loc = I2C_ROUTE_LOCATION_LOC1,
.cmu = cmuClock_I2C0, .cmu = cmuClock_I2C0,
.irq = I2C0_IRQn .irq = I2C0_IRQn,
.speed = I2C_SPEED_NORMAL
}, },
{ {
.dev = I2C1, .dev = I2C1,
@ -123,7 +124,8 @@ static const i2c_conf_t i2c_config[] = {
.scl_pin = GPIO_PIN(PC, 5), .scl_pin = GPIO_PIN(PC, 5),
.loc = I2C_ROUTE_LOCATION_LOC0, .loc = I2C_ROUTE_LOCATION_LOC0,
.cmu = cmuClock_I2C1, .cmu = cmuClock_I2C1,
.irq = I2C1_IRQn .irq = I2C1_IRQn,
.speed = I2C_SPEED_NORMAL
} }
}; };

6
boards/stk3700/include/periph_conf.h
View File

@ -115,7 +115,8 @@ static const i2c_conf_t i2c_config[] = {
.scl_pin = GPIO_PIN(PD, 7), .scl_pin = GPIO_PIN(PD, 7),
.loc = I2C_ROUTE_LOCATION_LOC1, .loc = I2C_ROUTE_LOCATION_LOC1,
.cmu = cmuClock_I2C0, .cmu = cmuClock_I2C0,
.irq = I2C0_IRQn .irq = I2C0_IRQn,
.speed = I2C_SPEED_NORMAL
}, },
{ {
.dev = I2C1, .dev = I2C1,
@ -123,7 +124,8 @@ static const i2c_conf_t i2c_config[] = {
.scl_pin = GPIO_PIN(PC, 5), .scl_pin = GPIO_PIN(PC, 5),
.loc = I2C_ROUTE_LOCATION_LOC0, .loc = I2C_ROUTE_LOCATION_LOC0,
.cmu = cmuClock_I2C1, .cmu = cmuClock_I2C1,
.irq = I2C1_IRQn .irq = I2C1_IRQn,
.speed = I2C_SPEED_NORMAL
} }
}; };