Merge pull request #7435 from gebart/pr/kinetis-rm-unused-config

kinetis: Remove unused configuration items
RIOT-OS · Aug 2, 2017 · 020c2a4 · 020c2a4
2 parents 1702779 + d8cc66e
commit 020c2a4
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 44 deletions.
diff --git a/boards/frdm-k22f/include/periph_conf.h b/boards/frdm-k22f/include/periph_conf.h
@@ -224,9 +224,7 @@ static const spi_conf_t spi_config[] = {
 * @{
 */
 #define I2C_NUMOF                    (1U)
-#define I2C_CLK                      CLOCK_BUSCLOCK
 #define I2C_0_EN                     1
-#define I2C_IRQ_PRIO                 1
 /* Low (10 kHz): MUL = 2, SCL divider = 1536, total: 3072 */
 #define KINETIS_I2C_F_ICR_LOW        (0x36)
 #define KINETIS_I2C_F_MULT_LOW       (1)
@@ -255,13 +253,6 @@ static const spi_conf_t spi_config[] = {
 #define I2C_0_PORT_CFG               (PORT_PCR_MUX(I2C_0_PIN_AF) | PORT_PCR_ODE_MASK)
 /** @} */
 
-/**
- * @name GPIO configuration
- * @{
- */
-#define GPIO_IRQ_PRIO                CPU_DEFAULT_IRQ_PRIO
-/** @} */
-
 /**
 * @name RTT and RTC configuration
 * @{

diff --git a/boards/frdm-k64f/include/periph_conf.h b/boards/frdm-k64f/include/periph_conf.h
@@ -219,9 +219,7 @@ static const spi_conf_t spi_config[] = {
 * @{
 */
 #define I2C_NUMOF                    (1U)
-#define I2C_CLK                      CLOCK_BUSCLOCK
 #define I2C_0_EN                     1
-#define I2C_IRQ_PRIO                 1
 /* Low (10 kHz): MUL = 4, SCL divider = 1536, total: 6144 */
 #define KINETIS_I2C_F_ICR_LOW        (0x36)
 #define KINETIS_I2C_F_MULT_LOW       (2)
@@ -250,13 +248,6 @@ static const spi_conf_t spi_config[] = {
 #define I2C_0_PORT_CFG               (PORT_PCR_MUX(I2C_0_PIN_AF) | PORT_PCR_ODE_MASK)
 /** @} */
 
-/**
- * @name GPIO configuration
- * @{
- */
-#define GPIO_IRQ_PRIO                CPU_DEFAULT_IRQ_PRIO
-/** @} */
-
 /**
 * @name RTT and RTC configuration
 * @{

diff --git a/boards/mulle/include/periph_conf.h b/boards/mulle/include/periph_conf.h
@@ -316,10 +316,8 @@ static const spi_conf_t spi_config[] = {
  * @{
  */
 #define I2C_NUMOF               (1U)
-#define I2C_CLK                 CLOCK_BUSCLOCK
 #define I2C_0_EN                1
 #define I2C_1_EN                0
-#define I2C_IRQ_PRIO            CPU_DEFAULT_IRQ_PRIO
 
 /* I2C 0 device configuration */
 #define I2C_0_DEV               I2C0
@@ -354,14 +352,6 @@ static const spi_conf_t spi_config[] = {
 #define KINETIS_I2C_F_MULT_FAST_PLUS (0)
 /** @} */
 
-/**
- * @name GPIO configuration
- * @{
- */
-#define GPIO_IRQ_PRIO       CPU_DEFAULT_IRQ_PRIO
-/** @} */
-
-
 /**
  * @name RTC configuration
  * @{

diff --git a/boards/pba-d-01-kw2x/include/periph_conf.h b/boards/pba-d-01-kw2x/include/periph_conf.h
@@ -248,9 +248,7 @@ static const spi_conf_t spi_config[] = {
  * @{
  */
 #define I2C_NUMOF               (1U)
-#define I2C_CLK                 (CLOCK_BUSCLOCK)
 #define I2C_0_EN                1
-#define I2C_IRQ_PRIO            1
 /* Low (10 kHz): MUL = 2, SCL divider = 2560, total: 5120 */
 #define KINETIS_I2C_F_ICR_LOW        (0x3D)
 #define KINETIS_I2C_F_MULT_LOW       (1)
@@ -280,14 +278,6 @@ static const spi_conf_t spi_config[] = {
 
 /** @} */
 
-
-/**
- * @name GPIO configuration
- * @{
- */
-#define GPIO_IRQ_PRIO       CPU_DEFAULT_IRQ_PRIO
-/** @} */
-
 /**
 * @name RTT and RTC configuration
 * @{

diff --git a/cpu/kinetis_common/doc.txt b/cpu/kinetis_common/doc.txt
@@ -39,10 +39,7 @@
  *
  *              The GPIO driver uses the @ref GPIO_PIN(port, pin) macro to declare pins.
  *
- *              ### GPIO configuration example (for periph_conf.h) ###
- *
- *                  #define GPIO_IRQ_PRIO                CPU_DEFAULT_IRQ_PRIO
- *
+ *              No configuration is necessary.
  */
 
 /**
@@ -53,9 +50,7 @@
  *              ### I2C configuration example (for periph_conf.h) ###
  *
  *                  #define I2C_NUMOF               (1U)
- *                  #define I2C_CLK                 (48e6)
  *                  #define I2C_0_EN                1
- *                  #define I2C_IRQ_PRIO            1
  *
  *                  / * Low (10 kHz): MUL = 4, SCL divider = 2560, total: 10240 * /
  *                  #define KINETIS_I2C_F_ICR_LOW        (0x3D)