diff --git a/boards/samr21-xpro/include/periph_conf.h b/boards/samr21-xpro/include/periph_conf.h
index ed1f1ad2d6..1d52d04603 100644
--- a/boards/samr21-xpro/include/periph_conf.h
+++ b/boards/samr21-xpro/include/periph_conf.h
@@ -138,9 +138,8 @@ static const uart_conf_t uart_config[] = {
  * TODO: this should be moved into the CPU folder
  */
 typedef struct {
-    PortGroup *port;            /**< GPIO port */
-    uint8_t pin;                /**< GPIO pin */
-    uint8_t fnct;               /**< pin function multiplex value */
+    gpio_t pin;                 /**< GPIO pin */
+    gpio_mux_t mux;             /**< pin function multiplex value */
     uint8_t chan;               /**< TCC channel to use */
 } pwm_conf_chan_t;
 
@@ -160,15 +159,15 @@ static const pwm_conf_t pwm_config[] = {
 #if PWM_0_EN
     {TCC1, {
         /* port , pin, AF, chan */
-        {(PortGroup *)0x41004400, 6, 4, 0},
-        {(PortGroup *)0x41004400, 7, 4, 1}
+        {GPIO_PIN(PA,6), GPIO_MUX_E, 0},
+        {GPIO_PIN(PA,7), GPIO_MUX_E, 1}
     }},
 #endif
 #if PWM_1_EN
     {TCC0, {
         /* port , pin, AF, chan */
-        {(PortGroup *)0x41004400, 18, 5, 2},
-        {(PortGroup *)0x41004400, 19, 5, 3}
+        {GPIO_PIN(PA, 18), GPIO_MUX_F, 2},
+        {GPIO_PIN(PA, 19), GPIO_MUX_F, 3}
     }},
 #endif
 };