From dce3bba8c4b67f225d78aaf5cee35f903f488ea0 Mon Sep 17 00:00:00 2001
From: smlng <s@mlng.net>
Date: Thu, 14 Jun 2018 12:26:00 +0200
Subject: [PATCH] boards: fix config of cc2538 boards for new I2C API
---
boards/cc2538dk/include/periph_conf.h | 18 ++++++------------
boards/openmote-cc2538/include/periph_conf.h | 18 ++++++------------
boards/remote-pa/include/periph_conf.h | 18 ++++++------------
boards/remote-reva/include/periph_conf.h | 18 ++++++------------
boards/remote-revb/include/periph_conf.h | 18 ++++++------------
5 files changed, 30 insertions(+), 60 deletions(-)
diff --git a/boards/cc2538dk/include/periph_conf.h b/boards/cc2538dk/include/periph_conf.h
index a0a744fe27..4f020a128f 100644
--- a/boards/cc2538dk/include/periph_conf.h
+++ b/boards/cc2538dk/include/periph_conf.h
@@ -84,23 +84,17 @@ static const uart_conf_t uart_config[] = {
* @name I2C configuration
* @{
*/
-#define I2C_NUMOF 1
-#define I2C_0_EN 1
#define I2C_IRQ_PRIO 1
-/* I2C 0 device configuration */
-#define I2C_0_DEV 0
-#define I2C_0_IRQ I2C_IRQn
-#define I2C_0_IRQ_HANDLER isr_i2c
-#define I2C_0_SCL_PIN GPIO_PA2 /* SPI_SCK on the SmartRF06 baseboard */
-#define I2C_0_SDA_PIN GPIO_PA4 /* SPI_MOSI on the SmartRF06 baseboard */
-
-static const i2c_conf_t i2c_config[I2C_NUMOF] = {
+static const i2c_conf_t i2c_config[] = {
{
- .scl_pin = GPIO_PA2, /* SPI_SCK on the SmartRF06 baseboard */
- .sda_pin = GPIO_PA4, /* SPI_MOSI on the SmartRF06 baseboard */
+ .speed = I2C_SPEED_FAST, /**< bus speed */
+ .scl_pin = GPIO_PIN(0, 2), /**< GPIO_PA2, SPI_SCK on SmartRF06 */
+ .sda_pin = GPIO_PIN(0, 4) /**< GPIO_PA4, SPI_MOSI on SmartRF06 */
},
};
+
+#define I2C_NUMOF (sizeof(i2c_config) / sizeof(i2c_config[0]))
/** @} */
/**
diff --git a/boards/openmote-cc2538/include/periph_conf.h b/boards/openmote-cc2538/include/periph_conf.h
index c63c52c122..912c8bbf5a 100644
--- a/boards/openmote-cc2538/include/periph_conf.h
+++ b/boards/openmote-cc2538/include/periph_conf.h
@@ -107,23 +107,17 @@ static const uart_conf_t uart_config[] = {
* @name I2C configuration
* @{
*/
-#define I2C_NUMOF 1
-#define I2C_0_EN 1
#define I2C_IRQ_PRIO 1
-/* I2C 0 device configuration */
-#define I2C_0_DEV 0
-#define I2C_0_IRQ I2C_IRQn
-#define I2C_0_IRQ_HANDLER isr_i2c
-#define I2C_0_SCL_PIN GPIO_PB3 /* OpenBattery */
-#define I2C_0_SDA_PIN GPIO_PB4 /* OpenBattery */
-
-static const i2c_conf_t i2c_config[I2C_NUMOF] = {
+static const i2c_conf_t i2c_config[] = {
{
- .scl_pin = GPIO_PB3, /* OpenBattery */
- .sda_pin = GPIO_PB4, /* OpenBattery */
+ .speed = I2C_SPEED_FAST, /**< bus speed */
+ .scl_pin = GPIO_PIN(1, 3), /**< GPIO_PB3, OpenBattery */
+ .sda_pin = GPIO_PIN(1, 4) /**< GPIO_PB4, OpenBattery */
},
};
+
+#define I2C_NUMOF (sizeof(i2c_config) / sizeof(i2c_config[0]))
/** @} */
/**
diff --git a/boards/remote-pa/include/periph_conf.h b/boards/remote-pa/include/periph_conf.h
index e3a15a19ec..c5fe4f3db7 100644
--- a/boards/remote-pa/include/periph_conf.h
+++ b/boards/remote-pa/include/periph_conf.h
@@ -32,23 +32,17 @@
* @name I2C configuration
* @{
*/
-#define I2C_NUMOF 1
-#define I2C_0_EN 1
#define I2C_IRQ_PRIO 1
-/* I2C 0 device configuration */
-#define I2C_0_DEV 0
-#define I2C_0_IRQ I2C_IRQn
-#define I2C_0_IRQ_HANDLER isr_i2c
-#define I2C_0_SCL_PIN GPIO_PB1
-#define I2C_0_SDA_PIN GPIO_PB0
-
-static const i2c_conf_t i2c_config[I2C_NUMOF] = {
+static const i2c_conf_t i2c_config[] = {
{
- .scl_pin = I2C_0_SCL_PIN,
- .sda_pin = I2C_0_SDA_PIN,
+ .speed = I2C_SPEED_FAST, /**< bus speed */
+ .scl_pin = GPIO_PIN(1, 1), /**< GPIO_PB1 */
+ .sda_pin = GPIO_PIN(1, 0) /**< GPIO_PB0 */
},
};
+
+#define I2C_NUMOF (sizeof(i2c_config) / sizeof(i2c_config[0]))
/** @} */
/**
diff --git a/boards/remote-reva/include/periph_conf.h b/boards/remote-reva/include/periph_conf.h
index cd1b6e0245..ebec0f3207 100644
--- a/boards/remote-reva/include/periph_conf.h
+++ b/boards/remote-reva/include/periph_conf.h
@@ -32,23 +32,17 @@
* @name I2C configuration
* @{
*/
-#define I2C_NUMOF 1
-#define I2C_0_EN 1
#define I2C_IRQ_PRIO 1
-/* I2C 0 device configuration */
-#define I2C_0_DEV 0
-#define I2C_0_IRQ I2C_IRQn
-#define I2C_0_IRQ_HANDLER isr_i2c
-#define I2C_0_SCL_PIN GPIO_PC3
-#define I2C_0_SDA_PIN GPIO_PC2
-
-static const i2c_conf_t i2c_config[I2C_NUMOF] = {
+static const i2c_conf_t i2c_config[] = {
{
- .scl_pin = I2C_0_SCL_PIN,
- .sda_pin = I2C_0_SDA_PIN,
+ .speed = I2C_SPEED_FAST, /**< bus speed */
+ .scl_pin = GPIO_PIN(2, 3), /**< GPIO_PC3 */
+ .sda_pin = GPIO_PIN(2, 2) /**< GPIO_PC2 */
},
};
+
+#define I2C_NUMOF (sizeof(i2c_config) / sizeof(i2c_config[0]))
/** @} */
/**
diff --git a/boards/remote-revb/include/periph_conf.h b/boards/remote-revb/include/periph_conf.h
index b5eb53a387..07e6a15479 100644
--- a/boards/remote-revb/include/periph_conf.h
+++ b/boards/remote-revb/include/periph_conf.h
@@ -35,23 +35,17 @@
* @name I2C configuration
* @{
*/
-#define I2C_NUMOF 1
-#define I2C_0_EN 1
#define I2C_IRQ_PRIO 1
-/* I2C 0 device configuration */
-#define I2C_0_DEV 0
-#define I2C_0_IRQ I2C_IRQn
-#define I2C_0_IRQ_HANDLER isr_i2c
-#define I2C_0_SCL_PIN GPIO_PC3
-#define I2C_0_SDA_PIN GPIO_PC2
-
-static const i2c_conf_t i2c_config[I2C_NUMOF] = {
+static const i2c_conf_t i2c_config[] = {
{
- .scl_pin = I2C_0_SCL_PIN,
- .sda_pin = I2C_0_SDA_PIN,
+ .speed = I2C_SPEED_FAST, /**< bus speed */
+ .scl_pin = GPIO_PIN(2, 3), /**< GPIO_PC3 */
+ .sda_pin = GPIO_PIN(2, 2) /**< GPIO_PC2 */
},
};
+
+#define I2C_NUMOF (sizeof(i2c_config) / sizeof(i2c_config[0]))
/** @} */
/**
--
GitLab