diff --git a/boards/fox/include/board.h b/boards/fox/include/board.h
index f489bcbf4a1469e14d9b2c28ed0447161efea8e0..29bef23df5f2aa3edd1075ae8814a286204f650e 100644
--- a/boards/fox/include/board.h
+++ b/boards/fox/include/board.h
@@ -52,10 +52,10 @@ extern "C" {
* @{
*/
#define AT86RF231_SPI SPI_0
-#define AT86RF231_CS GPIO(PORT_A,1)
-#define AT86RF231_INT GPIO(PORT_C,2)
-#define AT86RF231_RESET GPIO(PORT_C,1)
-#define AT86RF231_SLEEP GPIO(PORT_A,0)
+#define AT86RF231_CS GPIO_PIN(PORT_A,1)
+#define AT86RF231_INT GPIO_PIN(PORT_C,2)
+#define AT86RF231_RESET GPIO_PIN(PORT_C,1)
+#define AT86RF231_SLEEP GPIO_PIN(PORT_A,0)
/** @} */
/**
@@ -72,8 +72,8 @@ extern "C" {
*/
#define L3G4200D_I2C I2C_0
#define L3G4200D_ADDR 0x68
-#define L3G4200D_DRDY GPIO(PORT_B,8)
-#define L3G4200D_INT GPIO(PORT_B,11)
+#define L3G4200D_DRDY GPIO_PIN(PORT_B,8)
+#define L3G4200D_INT GPIO_PIN(PORT_B,11)
/** @} */
/**
@@ -83,9 +83,9 @@ extern "C" {
#define LSM303DLHC_I2C I2C_0
#define LSM303DLHC_ACC_ADDR (25)
#define LSM303DLHC_MAG_ADDR (30)
-#define LSM303DLHC_INT1 GPIO(PORT_B,9)
-#define LSM303DLHC_INT2 GPIO(PORT_B,5)
-#define LSM303DLHC_DRDY GPIO(PORT_A,9)
+#define LSM303DLHC_INT1 GPIO_PIN(PORT_B,9)
+#define LSM303DLHC_INT2 GPIO_PIN(PORT_B,5)
+#define LSM303DLHC_DRDY GPIO_PIN(PORT_A,9)
/** @} */
/**
@@ -94,10 +94,10 @@ extern "C" {
*/
#define LED_RED_PORT (GPIOB)
#define LED_RED_PIN (10)
-#define LED_RED_GPIO GPIO(PORT_B,10)
+#define LED_RED_GPIO GPIO_PIN(PORT_B,10)
#define LED_GREEN_PORT (GPIOB)
#define LED_GREEN_PIN (12)
-#define LED_GREEN_GPIO GPIO(PORT_B,12)
+#define LED_GREEN_GPIO GPIO_PIN(PORT_B,12)
/** @} */
/**
diff --git a/boards/fox/include/periph_conf.h b/boards/fox/include/periph_conf.h
index 6804cd279a68c02e37834f8d2a79857094b38df1..9ddabaefad42d179036365ec024d8414eb6953f2 100644
--- a/boards/fox/include/periph_conf.h
+++ b/boards/fox/include/periph_conf.h
@@ -94,8 +94,8 @@ extern "C" {
#define UART_0_ISR isr_usart2
#define UART_0_BUS_FREQ 36000000
/* UART 0 pin configuration */
-#define UART_0_RX_PIN GPIO(PORT_A,3)
-#define UART_0_TX_PIN GPIO(PORT_A,2)
+#define UART_0_RX_PIN GPIO_PIN(PORT_A,3)
+#define UART_0_TX_PIN GPIO_PIN(PORT_A,2)
/* UART 1 device configuration */
#define UART_1_DEV USART1
@@ -104,8 +104,8 @@ extern "C" {
#define UART_1_ISR isr_usart1
#define UART_1_BUS_FREQ 72000000
/* UART 1 pin configuration */
-#define UART_1_RX_PIN GPIO(PORT_A,10)
-#define UART_1_TX_PIN GPIO(PORT_A,9)
+#define UART_1_RX_PIN GPIO_PIN(PORT_A,10)
+#define UART_1_TX_PIN GPIO_PIN(PORT_A,9)
/** @} */
/**
@@ -116,14 +116,14 @@ extern "C" {
#define SPI_0_EN 1
/* SPI 0 device configuration */
-#define SPI_0_DEV SPI2
-#define SPI_0_CLKEN() (RCC->APB1ENR |= RCC_APB1ENR_SPI2EN)
-#define SPI_0_CLKDIS() (RCC->APB1ENR &= ~(RCC_APB1ENR_SPI2EN))
-#define SPI_0_BUS_DIV 0 /* 1 -> SPI runs with full CPU clock, 0 -> half CPU clock */
+#define SPI_0_DEV SPI2
+#define SPI_0_CLKEN() (RCC->APB1ENR |= RCC_APB1ENR_SPI2EN)
+#define SPI_0_CLKDIS() (RCC->APB1ENR &= ~(RCC_APB1ENR_SPI2EN))
+#define SPI_0_BUS_DIV 0 /* 1 -> SPI runs with full CPU clock, 0 -> half CPU clock */
/* SPI 0 pin configuration */
-#define SPI_0_CLK_PIN GPIO(PORT_B,13)
-#define SPI_0_MOSI_PIN GPIO(PORT_B,15)
-#define SPI_0_MISO_PIN GPIO(PORT_B,14)
+#define SPI_0_CLK_PIN GPIO_PIN(PORT_B,13)
+#define SPI_0_MOSI_PIN GPIO_PIN(PORT_B,15)
+#define SPI_0_MISO_PIN GPIO_PIN(PORT_B,14)
/** @} */
/**
@@ -159,8 +159,8 @@ extern "C" {
#define I2C_0_ERR_IRQ I2C1_ER_IRQn
#define I2C_0_ERR_ISR isr_i2c1_er
/* I2C 0 pin configuration */
-#define I2C_0_SCL_PIN GPIO(PORT_B,6)
-#define I2C_0_SDA_PIN GPIO(PORT_B,7)
+#define I2C_0_SCL_PIN GPIO_PIN(PORT_B,6)
+#define I2C_0_SDA_PIN GPIO_PIN(PORT_B,7)
/** @} */
#ifdef __cplusplus
diff --git a/boards/iotlab-m3/include/board.h b/boards/iotlab-m3/include/board.h
index 43e946fbc21c8fe876305a38526e61ee0dcb0b35..36aeed2b7e3b01d01093757519ce58a24c138f47 100644
--- a/boards/iotlab-m3/include/board.h
+++ b/boards/iotlab-m3/include/board.h
@@ -57,10 +57,10 @@ extern "C" {
* @{
*/
#define AT86RF231_SPI SPI_0
-#define AT86RF231_CS GPIO(PORT_A,4)
-#define AT86RF231_INT GPIO(PORT_C,4)
-#define AT86RF231_RESET GPIO(PORT_C,1)
-#define AT86RF231_SLEEP GPIO(PORT_A,2)
+#define AT86RF231_CS GPIO_PIN(PORT_A,4)
+#define AT86RF231_INT GPIO_PIN(PORT_C,4)
+#define AT86RF231_RESET GPIO_PIN(PORT_C,1)
+#define AT86RF231_SLEEP GPIO_PIN(PORT_A,2)
#define AT86RF231_SPI_CLK SPI_SPEED_5MHZ
/** @} */
@@ -69,9 +69,9 @@ extern "C" {
* @{
*/
#define EXTFLASH_SPI SPI_1
-#define EXTFLASH_CS GPIO(PORT_A,11)
-#define EXTFLASH_WRITE GPIO(PORT_C,6)
-#define EXTFLASH_HOLD GPIO(PORT_C,9)
+#define EXTFLASH_CS GPIO_PIN(PORT_A,11)
+#define EXTFLASH_WRITE GPIO_PIN(PORT_C,6)
+#define EXTFLASH_HOLD GPIO_PIN(PORT_C,9)
/** @} */
/**
@@ -96,8 +96,8 @@ extern "C" {
*/
#define L3G4200D_I2C I2C_0
#define L3G4200D_ADDR 0x68
-#define L3G4200D_DRDY GPIO(PORT_C,0)
-#define L3G4200D_INT GPIO(PORT_C,5)
+#define L3G4200D_DRDY GPIO_PIN(PORT_C,0)
+#define L3G4200D_INT GPIO_PIN(PORT_C,5)
/** @} */
/**
@@ -107,9 +107,9 @@ extern "C" {
#define LSM303DLHC_I2C I2C_0
#define LSM303DLHC_ACC_ADDR (0x19)
#define LSM303DLHC_MAG_ADDR (0x1e)
-#define LSM303DLHC_INT1 GPIO(PORT_B,12)
-#define LSM303DLHC_INT2 GPIO(PORT_B,1)
-#define LSM303DLHC_DRDY GPIO(PORT_B,2)
+#define LSM303DLHC_INT1 GPIO_PIN(PORT_B,12)
+#define LSM303DLHC_INT2 GPIO_PIN(PORT_B,1)
+#define LSM303DLHC_DRDY GPIO_PIN(PORT_B,2)
/** @} */
/**
@@ -118,13 +118,13 @@ extern "C" {
*/
#define LED_RED_PORT (GPIOD)
#define LED_RED_PIN (2)
-#define LED_RED_GPIO GPIO(PORT_D,2)
+#define LED_RED_GPIO GPIO_PIN(PORT_D,2)
#define LED_GREEN_PORT (GPIOB)
#define LED_GREEN_PIN (5)
-#define LED_GREEN_GPIO GPIO(PORT_B,5)
+#define LED_GREEN_GPIO GPIO_PIN(PORT_B,5)
#define LED_ORANGE_PORT (GPIOC)
#define LED_ORANGE_PIN (10)
-#define LED_ORANGE_GPIO GPIO(PORT_C,10)
+#define LED_ORANGE_GPIO GPIO_PIN(PORT_C,10)
/** @} */
/**
diff --git a/boards/iotlab-m3/include/periph_conf.h b/boards/iotlab-m3/include/periph_conf.h
index cfd89054ec43b134b005d55d4225c420989e4ebf..fe841150cd7ebbd1921dcddcbc78dbd62fe2c323 100644
--- a/boards/iotlab-m3/include/periph_conf.h
+++ b/boards/iotlab-m3/include/periph_conf.h
@@ -95,8 +95,8 @@ extern "C" {
#define UART_0_ISR isr_usart1
#define UART_0_BUS_FREQ 72000000
/* UART 0 pin configuration */
-#define UART_0_RX_PIN GPIO(PORT_A,10)
-#define UART_0_TX_PIN GPIO(PORT_A,9)
+#define UART_0_RX_PIN GPIO_PIN(PORT_A,10)
+#define UART_0_TX_PIN GPIO_PIN(PORT_A,9)
/* UART 1 device configuration */
#define UART_1_DEV USART2
@@ -105,8 +105,8 @@ extern "C" {
#define UART_1_ISR isr_usart2
#define UART_1_BUS_FREQ 36000000
/* UART 1 pin configuration */
-#define UART_1_RX_PIN GPIO(PORT_A,3)
-#define UART_1_TX_PIN GPIO(PORT_A,2)
+#define UART_1_RX_PIN GPIO_PIN(PORT_A,3)
+#define UART_1_TX_PIN GPIO_PIN(PORT_A,2)
/** @} */
/**
@@ -117,14 +117,14 @@ extern "C" {
#define SPI_0_EN 1
/* SPI 0 device configuration */
-#define SPI_0_DEV SPI1
-#define SPI_0_CLKEN() (RCC->APB2ENR |= RCC_APB2ENR_SPI1EN)
-#define SPI_0_CLKDIS() (RCC->APB2ENR &= ~(RCC_APB2ENR_SPI1EN))
-#define SPI_0_BUS_DIV 1 /* 1 -> SPI runs with full CPU clock, 0 -> half CPU clock */
+#define SPI_0_DEV SPI1
+#define SPI_0_CLKEN() (RCC->APB2ENR |= RCC_APB2ENR_SPI1EN)
+#define SPI_0_CLKDIS() (RCC->APB2ENR &= ~(RCC_APB2ENR_SPI1EN))
+#define SPI_0_BUS_DIV 1 /* 1 -> SPI runs with full CPU clock, 0 -> half CPU clock */
/* SPI 0 pin configuration */
-#define SPI_0_CLK_PIN GPIO(PORT_A,5)
-#define SPI_0_MOSI_PIN GPIO(PORT_A,7)
-#define SPI_0_MISO_PIN GPIO(PORT_A,6)
+#define SPI_0_CLK_PIN GPIO_PIN(PORT_A,5)
+#define SPI_0_MOSI_PIN GPIO_PIN(PORT_A,7)
+#define SPI_0_MISO_PIN GPIO_PIN(PORT_A,6)
/** @} */
/**
@@ -160,8 +160,8 @@ extern "C" {
#define I2C_0_ERR_IRQ I2C1_ER_IRQn
#define I2C_0_ERR_ISR isr_i2c1_er
/* I2C 0 pin configuration */
-#define I2C_0_SCL_PIN GPIO(PORT_B,6)
-#define I2C_0_SDA_PIN GPIO(PORT_B,7)
+#define I2C_0_SCL_PIN GPIO_PIN(PORT_B,6)
+#define I2C_0_SDA_PIN GPIO_PIN(PORT_B,7)
/** @} */
#ifdef __cplusplus
diff --git a/boards/limifrog-v1/include/board.h b/boards/limifrog-v1/include/board.h
index 7f5a19638c02b4de86d3924aa63f69f14469fbc1..b0fda42d076bf4cd711ad9dbf1b61fd2d267bb0a 100644
--- a/boards/limifrog-v1/include/board.h
+++ b/boards/limifrog-v1/include/board.h
@@ -49,9 +49,9 @@ extern "C" {
* @name LED pin definitions
* @{
*/
-#define LED_RED_PORT (GPIOC)
-#define LED_RED_PIN (3)
-#define LED_RED_GPIO GPIO(PORT_C,3)
+#define LED_RED_PORT (GPIOC)
+#define LED_RED_PIN (3)
+#define LED_RED_GPIO GPIO_PIN(PORT_C,3)
/** @} */
/**
diff --git a/boards/msb-430/include/periph_conf.h b/boards/msb-430/include/periph_conf.h
index 8a94496653c92ac5ae92151888257d970a53c43d..7a1b35974707c61b12720858614186f79de85aa0 100644
--- a/boards/msb-430/include/periph_conf.h
+++ b/boards/msb-430/include/periph_conf.h
@@ -82,9 +82,9 @@ extern "C" {
#define SPI_IE_TX_BIT (1 << 7)
#define SPI_ME (SFR->ME1)
#define SPI_ME_BIT (1 << 6)
-#define SPI_PIN_MISO GPIO(P5,2)
-#define SPI_PIN_MOSI GPIO(P5,1)
-#define SPI_PIN_CLK GPIO(P5,3)
+#define SPI_PIN_MISO GPIO_PIN(P5,2)
+#define SPI_PIN_MOSI GPIO_PIN(P5,1)
+#define SPI_PIN_CLK GPIO_PIN(P5,3)
/** @} */
#ifdef __cplusplus
diff --git a/boards/msb-430h/include/periph_conf.h b/boards/msb-430h/include/periph_conf.h
index c323138611021693777dd3208d6bb76242db7eec..d1907a88b76cb0e5c5e7d4a7486a7e99f34db1f4 100644
--- a/boards/msb-430h/include/periph_conf.h
+++ b/boards/msb-430h/include/periph_conf.h
@@ -84,9 +84,9 @@ extern "C" {
#define SPI_IE_TX_BIT (1 << 7)
#define SPI_ME (SFR->ME1)
#define SPI_ME_BIT (1 << 6)
-#define SPI_PIN_MISO GPIO(P3,2)
-#define SPI_PIN_MOSI GPIO(P3,1)
-#define SPI_PIN_CLK GPIO(P3,3)
+#define SPI_PIN_MISO GPIO_PIN(P3,2)
+#define SPI_PIN_MOSI GPIO_PIN(P3,1)
+#define SPI_PIN_CLK GPIO_PIN(P3,3)
/** @} */
#ifdef __cplusplus
diff --git a/boards/msbiot/include/board.h b/boards/msbiot/include/board.h
index 7014a313bfdbc75a5c7088289f822717ccb1b885..9680863aba4ff1e2f6675f7b3d7328533bfb244e 100644
--- a/boards/msbiot/include/board.h
+++ b/boards/msbiot/include/board.h
@@ -40,10 +40,10 @@ extern "C" {
* @{
*/
#define CC110X_SPI SPI_0
-#define CC110X_CS GPIO(PORT_B, 12)
-#define CC110X_GDO0 GPIO(PORT_C, 4)
-#define CC110X_GDO1 GPIO(PORT_A, 6)
-#define CC110X_GDO2 GPIO(PORT_C, 5)
+#define CC110X_CS GPIO_PIN(PORT_B, 12)
+#define CC110X_GDO0 GPIO_PIN(PORT_C, 4)
+#define CC110X_GDO1 GPIO_PIN(PORT_A, 6)
+#define CC110X_GDO2 GPIO_PIN(PORT_C, 5)
/** @} */
/**
diff --git a/boards/nucleo-l1/include/periph_conf.h b/boards/nucleo-l1/include/periph_conf.h
index aa18c55360f3a4a3ae294edcc0b32716faf4ff68..833a1c95d0025b142f3b85f0f4cd95cb6a2a9f71 100644
--- a/boards/nucleo-l1/include/periph_conf.h
+++ b/boards/nucleo-l1/include/periph_conf.h
@@ -72,8 +72,8 @@ static const timer_conf_t timer_config[] = {
#define UART_0_ISR isr_usart2
#define UART_0_BUS_FREQ 32000000
/* UART 0 pin configuration */
-#define UART_0_RX_PIN GPIO(PORT_A, 3)
-#define UART_0_TX_PIN GPIO(PORT_A, 2)
+#define UART_0_RX_PIN GPIO_PIN(PORT_A, 3)
+#define UART_0_TX_PIN GPIO_PIN(PORT_A, 2)
#define UART_0_AF GPIO_AF7
/**
diff --git a/boards/saml21-xpro/board.c b/boards/saml21-xpro/board.c
index e20b6d35f278812cdcb2d8e419d800b2adf6999d..d01673d58857a475d8cccb7ed50a4a9e95797693 100644
--- a/boards/saml21-xpro/board.c
+++ b/boards/saml21-xpro/board.c
@@ -44,5 +44,5 @@ void board_init(void)
*/
void led_init(void)
{
- gpio_init(GPIO(PB,10), GPIO_DIR_OUT, GPIO_NOPULL);
+ gpio_init(GPIO_PIN(PB,10), GPIO_DIR_OUT, GPIO_NOPULL);
}
diff --git a/boards/samr21-xpro/include/board.h b/boards/samr21-xpro/include/board.h
index 866c51ca9c06dd3ad65a2cf67b4d2e08330c9711..fd24914c288bceddcfeadc0902a08ad5bf745638 100644
--- a/boards/samr21-xpro/include/board.h
+++ b/boards/samr21-xpro/include/board.h
@@ -45,23 +45,23 @@ extern "C" {
* @name AT86RF233 configuration
* @{
*/
-#define AT86RF233_SPI (SPI_0)
-#define AT86RF233_CS GPIO(PB, 31)
-#define AT86RF233_INT GPIO(PB, 0)
-#define AT86RF233_RESET GPIO(PB, 15)
-#define AT86RF233_SLEEP GPIO(PA, 20)
-#define AT86RF233_SPI_CLK (SPI_SPEED_1MHZ)
+#define AT86RF233_SPI (SPI_0)
+#define AT86RF233_CS GPIO_PIN(PB, 31)
+#define AT86RF233_INT GPIO_PIN(PB, 0)
+#define AT86RF233_RESET GPIO_PIN(PB, 15)
+#define AT86RF233_SLEEP GPIO_PIN(PA, 20)
+#define AT86RF233_SPI_CLK (SPI_SPEED_1MHZ)
/** @}*/
/**
* @name AT86RF231 config
* @{
*/
-#define AT86RF231_SPI SPI_0
-#define AT86RF231_CS GPIO(PB, 31)
-#define AT86RF231_INT GPIO(PB, 0)
-#define AT86RF231_RESET GPIO(PB, 15)
-#define AT86RF231_SLEEP GPIO(PA, 20)
+#define AT86RF231_SPI SPI_0
+#define AT86RF231_CS GPIO_PIN(PB, 31)
+#define AT86RF231_INT GPIO_PIN(PB, 0)
+#define AT86RF231_RESET GPIO_PIN(PB, 15)
+#define AT86RF231_SLEEP GPIO_PIN(PA, 20)
#define AT86RF231_SPI_SPEED SPI_SPEED_1MHZ
/** @} */
diff --git a/boards/samr21-xpro/include/periph_conf.h b/boards/samr21-xpro/include/periph_conf.h
index cbcebc211aed1648eb5926444f6368c2a0dde705..ed1f1ad2d616222286d3d833d67317879dd75746 100644
--- a/boards/samr21-xpro/include/periph_conf.h
+++ b/boards/samr21-xpro/include/periph_conf.h
@@ -111,8 +111,8 @@ extern "C" {
/* UART device configuration */
static const uart_conf_t uart_config[] = {
/* device, RX pin, TX pin, mux */
- {&SERCOM0->USART, GPIO(PA,5), GPIO(PA,4), GPIO_MUX_D},
- {&SERCOM5->USART, GPIO(PA,23), GPIO(PA,22), GPIO_MUX_D},
+ {&SERCOM0->USART, GPIO_PIN(PA,5), GPIO_PIN(PA,4), GPIO_MUX_D},
+ {&SERCOM5->USART, GPIO_PIN(PA,23), GPIO_PIN(PA,22), GPIO_MUX_D},
};
/* interrupt function name mapping */
diff --git a/boards/spark-core/include/board.h b/boards/spark-core/include/board.h
index d0cfa1192b4fa04100e7b4e97bf98bc241bd2372..4e22c9bd035fc28e34ed5792c7bcb4042c36633f 100644
--- a/boards/spark-core/include/board.h
+++ b/boards/spark-core/include/board.h
@@ -81,16 +81,16 @@
/**
* @name User button configuration
*/
-#define BUTTON1 GPIO(PORT_B,2)
+#define BUTTON1 GPIO_PIN(PORT_B,2)
/**
* @name CC3000 pin configuration
* @{
*/
#define CC3000_SPI SPI_0
-#define CC3000_CS GPIO(PORT_B,12)
-#define CC3000_EN GPIO(PORT_B,8)
-#define CC3000_INT GPIO(PORT_B,11)
+#define CC3000_CS GPIO_PIN(PORT_B,12)
+#define CC3000_EN GPIO_PIN(PORT_B,8)
+#define CC3000_INT GPIO_PIN(PORT_B,11)
/** @} */
/**
@@ -98,7 +98,7 @@
* @{
*/
#define EXTFLASH_SPI SPI_0
-#define EXTFLASH GPIO(PORT_B,9)
+#define EXTFLASH GPIO_PIN(PORT_B,9)
/** @} */
/**
diff --git a/boards/spark-core/include/periph_conf.h b/boards/spark-core/include/periph_conf.h
index d1f4a101905c3a5cbec964165c3961b1649af9ac..0f1749c3a2694ce6511256f747d68f29c9263bc6 100644
--- a/boards/spark-core/include/periph_conf.h
+++ b/boards/spark-core/include/periph_conf.h
@@ -93,26 +93,26 @@
#define UART_0_ISR isr_usart2
#define UART_0_BUS_FREQ (CLOCK_CORECLOCK/2)
/* UART 0 pin configuration */
-#define UART_0_RX_PIN GPIO(PORT_A,3)
-#define UART_0_TX_PIN GPIO(PORT_A,2)
+#define UART_0_RX_PIN GPIO_PIN(PORT_A,3)
+#define UART_0_TX_PIN GPIO_PIN(PORT_A,2)
/** @} */
/**
* @brief SPI configuration
* @{
*/
-#define SPI_NUMOF (1U)
-#define SPI_0_EN 1
+#define SPI_NUMOF (1U)
+#define SPI_0_EN 1
/* SPI 0 device configuration */
-#define SPI_0_DEV SPI1
-#define SPI_0_CLKEN() (RCC->APB2ENR |= RCC_APB2ENR_SPI1EN)
-#define SPI_0_CLKDIS() (RCC->APB2ENR &= ~(RCC_APB2ENR_SPI1EN))
-#define SPI_0_BUS_DIV 0 /* 1 -> SPI runs with full CPU clock, 0 -> half CPU clock */
+#define SPI_0_DEV SPI1
+#define SPI_0_CLKEN() (RCC->APB2ENR |= RCC_APB2ENR_SPI1EN)
+#define SPI_0_CLKDIS() (RCC->APB2ENR &= ~(RCC_APB2ENR_SPI1EN))
+#define SPI_0_BUS_DIV 0 /* 1 -> SPI runs with full CPU clock, 0 -> half CPU clock */
/* SPI 0 pin configuration */
-#define SPI_0_CLK_PIN GPIO(PORT_B,15)
-#define SPI_0_MOSI_PIN GPIO(PORT_B,17)
-#define SPI_0_MISO_PIN GPIO(PORT_B,16)
+#define SPI_0_CLK_PIN GPIO_PIN(PORT_B,15)
+#define SPI_0_MOSI_PIN GPIO_PIN(PORT_B,17)
+#define SPI_0_MISO_PIN GPIO_PIN(PORT_B,16)
/** @} */
#ifdef __cplusplus
diff --git a/boards/telosb/include/periph_conf.h b/boards/telosb/include/periph_conf.h
index 383daef3ca4792586079cd29eed943844587ec16..6d31dcf2d4eeef9390cbd29913487fef75fe3f3e 100644
--- a/boards/telosb/include/periph_conf.h
+++ b/boards/telosb/include/periph_conf.h
@@ -82,9 +82,9 @@ extern "C" {
#define SPI_IE_TX_BIT (1 << 7)
#define SPI_ME (SFR->ME1)
#define SPI_ME_BIT (1 << 6)
-#define SPI_PIN_MISO GPIO(P3,2)
-#define SPI_PIN_MOSI GPIO(P3,1)
-#define SPI_PIN_CLK GPIO(P3,3)
+#define SPI_PIN_MISO GPIO_PIN(P3,2)
+#define SPI_PIN_MOSI GPIO_PIN(P3,1)
+#define SPI_PIN_CLK GPIO_PIN(P3,3)
/** @} */
#ifdef __cplusplus
diff --git a/boards/wsn430-common/include/periph_conf.h b/boards/wsn430-common/include/periph_conf.h
index c08015f6861fc41e344079b2f2c6d4c6ce358789..b98538d683e07e4bd9f91a4aafb76271fbca1a56 100644
--- a/boards/wsn430-common/include/periph_conf.h
+++ b/boards/wsn430-common/include/periph_conf.h
@@ -82,9 +82,9 @@ extern "C" {
#define SPI_IE_TX_BIT (1 << 7)
#define SPI_ME (SFR->ME1)
#define SPI_ME_BIT (1 << 6)
-#define SPI_PIN_MISO GPIO(P5,2)
-#define SPI_PIN_MOSI GPIO(P5,1)
-#define SPI_PIN_CLK GPIO(P5,3)
+#define SPI_PIN_MISO GPIO_PIN(P5,2)
+#define SPI_PIN_MOSI GPIO_PIN(P5,1)
+#define SPI_PIN_CLK GPIO_PIN(P5,3)
/** @} */
diff --git a/boards/z1/include/periph_conf.h b/boards/z1/include/periph_conf.h
index 4b9c85c4dfca78e57ed6fda367d290c92e8410b9..2c35c3ad37232af43a2b4730eca81d64bb047b87 100644
--- a/boards/z1/include/periph_conf.h
+++ b/boards/z1/include/periph_conf.h
@@ -81,9 +81,9 @@ extern "C" {
#define SPI_IF (SFR->IFG2)
#define SPI_IE_RX_BIT (1 << 2)
#define SPI_IE_TX_BIT (1 << 3)
-#define SPI_PIN_MISO GPIO(P3,2)
-#define SPI_PIN_MOSI GPIO(P3,1)
-#define SPI_PIN_CLK GPIO(P3,3)
+#define SPI_PIN_MISO GPIO_PIN(P3,2)
+#define SPI_PIN_MOSI GPIO_PIN(P3,1)
+#define SPI_PIN_CLK GPIO_PIN(P3,3)
/** @} */
#ifdef __cplusplus