drivers: gpio: sam: convert to DT_INST defines

Convert driver to use DT_INST_ defines. see zephyrproject-rtos#23107 Signed-off-by: Gerson Fernando Budke <[email protected]>
nandojve · Mar 9, 2020 · f41e096 · f41e096
1 parent 350b9e8
commit f41e096
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 255 deletions.
diff --git a/drivers/gpio/gpio_sam.c b/drivers/gpio/gpio_sam.c
@@ -321,142 +321,62 @@ int gpio_sam_init(struct device *dev)
 	return 0;
 }
 
-/* PORT A */
-#ifdef DT_GPIO_SAM_PORTA_BASE_ADDRESS
-static void port_a_sam_config_func(struct device *dev);
-
-static const struct gpio_sam_config port_a_sam_config = {
-	.common = {
-		.port_pin_mask = GPIO_PORT_PIN_MASK_FROM_NGPIOS(DT_INST_0_ATMEL_SAM_GPIO_NGPIOS),
-	},
-	.regs = (Pio *)DT_GPIO_SAM_PORTA_BASE_ADDRESS,
-	.periph_id = DT_GPIO_SAM_PORTA_PERIPHERAL_ID,
-	.config_func = port_a_sam_config_func,
-};
-
-static struct gpio_sam_runtime port_a_sam_runtime;
-
-DEVICE_AND_API_INIT(port_a_sam, DT_GPIO_SAM_PORTA_LABEL, gpio_sam_init,
-		    &port_a_sam_runtime, &port_a_sam_config, POST_KERNEL,
-		    CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &gpio_sam_api);
-
-static void port_a_sam_config_func(struct device *dev)
-{
-	IRQ_CONNECT(DT_GPIO_SAM_PORTA_IRQ, DT_GPIO_SAM_PORTA_IRQ_PRIO,
-		    gpio_sam_isr, DEVICE_GET(port_a_sam), 0);
-	irq_enable(DT_GPIO_SAM_PORTA_IRQ);
-}
-
-#endif /* DT_GPIO_SAM_PORTA_BASE_ADDRESS */
-
-/* PORT B */
-#ifdef DT_GPIO_SAM_PORTB_BASE_ADDRESS
-static void port_b_sam_config_func(struct device *dev);
-
-static const struct gpio_sam_config port_b_sam_config = {
-	.common = {
-		.port_pin_mask = GPIO_PORT_PIN_MASK_FROM_NGPIOS(DT_INST_1_ATMEL_SAM_GPIO_NGPIOS),
-	},
-	.regs = (Pio *)DT_GPIO_SAM_PORTB_BASE_ADDRESS,
-	.periph_id = DT_GPIO_SAM_PORTB_PERIPHERAL_ID,
-	.config_func = port_b_sam_config_func,
-};
-
-static struct gpio_sam_runtime port_b_sam_runtime;
-
-DEVICE_AND_API_INIT(port_b_sam, DT_GPIO_SAM_PORTB_LABEL, gpio_sam_init,
-		    &port_b_sam_runtime, &port_b_sam_config, POST_KERNEL,
-		    CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &gpio_sam_api);
-
-static void port_b_sam_config_func(struct device *dev)
-{
-	IRQ_CONNECT(DT_GPIO_SAM_PORTB_IRQ, DT_GPIO_SAM_PORTB_IRQ_PRIO,
-		    gpio_sam_isr, DEVICE_GET(port_b_sam), 0);
-	irq_enable(DT_GPIO_SAM_PORTB_IRQ);
-}
-
-#endif /* DT_GPIO_SAM_PORTB_BASE_ADDRESS */
-
-/* PORT C */
-#ifdef DT_GPIO_SAM_PORTC_BASE_ADDRESS
-static void port_c_sam_config_func(struct device *dev);
-
-static const struct gpio_sam_config port_c_sam_config = {
-	.common = {
-		.port_pin_mask = GPIO_PORT_PIN_MASK_FROM_NGPIOS(DT_INST_2_ATMEL_SAM_GPIO_NGPIOS),
-	},
-	.regs = (Pio *)DT_GPIO_SAM_PORTC_BASE_ADDRESS,
-	.periph_id = DT_GPIO_SAM_PORTC_PERIPHERAL_ID,
-	.config_func = port_c_sam_config_func,
-};
-
-static struct gpio_sam_runtime port_c_sam_runtime;
-
-DEVICE_AND_API_INIT(port_c_sam, DT_GPIO_SAM_PORTC_LABEL, gpio_sam_init,
-		    &port_c_sam_runtime, &port_c_sam_config, POST_KERNEL,
-		    CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &gpio_sam_api);
-
-static void port_c_sam_config_func(struct device *dev)
-{
-	IRQ_CONNECT(DT_GPIO_SAM_PORTC_IRQ, DT_GPIO_SAM_PORTC_IRQ_PRIO,
-		    gpio_sam_isr, DEVICE_GET(port_c_sam), 0);
-	irq_enable(DT_GPIO_SAM_PORTC_IRQ);
+#define GPIO_SAM_IRQ_CONNECT(n)					\
+do {									\
+	IRQ_CONNECT(DT_INST_##n##_ATMEL_SAM_GPIO_IRQ_0,			\
+		    DT_INST_##n##_ATMEL_SAM_GPIO_IRQ_0_PRIORITY,	\
+		    gpio_sam_isr, DEVICE_GET(port_##n##_sam), 0);	\
+	irq_enable(DT_INST_##n##_ATMEL_SAM_GPIO_IRQ_0);			\
+} while (0)
+
+#define GPIO_SAM_IRQ_HANDLER(n)					\
+static void port_##n##_sam_config_func(struct device *dev)		\
+{									\
+	GPIO_SAM_IRQ_CONNECT(n);					\
 }
 
-#endif /* DT_GPIO_SAM_PORTC_BASE_ADDRESS */
-
-/* PORT D */
-#ifdef DT_GPIO_SAM_PORTD_BASE_ADDRESS
-static void port_d_sam_config_func(struct device *dev);
-
-static const struct gpio_sam_config port_d_sam_config = {
-	.common = {
-		.port_pin_mask = GPIO_PORT_PIN_MASK_FROM_NGPIOS(DT_INST_3_ATMEL_SAM_GPIO_NGPIOS),
-	},
-	.regs = (Pio *)DT_GPIO_SAM_PORTD_BASE_ADDRESS,
-	.periph_id = DT_GPIO_SAM_PORTD_PERIPHERAL_ID,
-	.config_func = port_d_sam_config_func,
-};
-
-static struct gpio_sam_runtime port_d_sam_runtime;
-
-DEVICE_AND_API_INIT(port_d_sam, DT_GPIO_SAM_PORTD_LABEL, gpio_sam_init,
-		    &port_d_sam_runtime, &port_d_sam_config, POST_KERNEL,
-		    CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &gpio_sam_api);
-
-static void port_d_sam_config_func(struct device *dev)
-{
-	IRQ_CONNECT(DT_GPIO_SAM_PORTD_IRQ, DT_GPIO_SAM_PORTD_IRQ_PRIO,
-		    gpio_sam_isr, DEVICE_GET(port_d_sam), 0);
-	irq_enable(DT_GPIO_SAM_PORTD_IRQ);
+#define GPIO_SAM_DEVICE_CONFIG(n)					\
+static void port_##n##_sam_config_func(struct device *dev);		\
+static const struct gpio_sam_config port_##n##_sam_config = {		\
+	.common = {							\
+		.port_pin_mask = GPIO_PORT_PIN_MASK_FROM_NGPIOS(	\
+			DT_INST_##n##_ATMEL_SAM_GPIO_NGPIOS),		\
+	},								\
+	.regs = (Pio *)DT_INST_##n##_ATMEL_SAM_GPIO_BASE_ADDRESS,	\
+	.periph_id = DT_INST_##n##_ATMEL_SAM_GPIO_PERIPHERAL_ID,	\
+	.config_func = port_##n##_sam_config_func,			\
 }
 
-#endif /* DT_GPIO_SAM_PORTD_BASE_ADDRESS */
-
-/* PORT E */
-#ifdef DT_GPIO_SAM_PORTE_BASE_ADDRESS
-static void port_e_sam_config_func(struct device *dev);
-
-static const struct gpio_sam_config port_e_sam_config = {
-	.common = {
-		.port_pin_mask = GPIO_PORT_PIN_MASK_FROM_NGPIOS(DT_INST_4_ATMEL_SAM_GPIO_NGPIOS),
-	},
-	.regs = (Pio *)DT_GPIO_SAM_PORTE_BASE_ADDRESS,
-	.periph_id = DT_GPIO_SAM_PORTE_PERIPHERAL_ID,
-	.config_func = port_e_sam_config_func,
-};
+#define GPIO_SAM_DEVICE_DATA(n)					\
+static struct gpio_sam_runtime port_##n##_sam_runtime
+
+#define GPIO_SAM_DEVICE_INIT(n)					\
+	GPIO_SAM_DEVICE_CONFIG(n);					\
+	GPIO_SAM_DEVICE_DATA(n);					\
+	DEVICE_AND_API_INIT(port_##n##_sam,				\
+			    DT_INST_##n##_ATMEL_SAM_GPIO_LABEL,		\
+			    gpio_sam_init, &port_##n##_sam_runtime,	\
+			    &port_##n##_sam_config, POST_KERNEL,	\
+			    CONFIG_KERNEL_INIT_PRIORITY_DEVICE,		\
+			    &gpio_sam_api);				\
+	GPIO_SAM_IRQ_HANDLER(n)
+
+#if DT_INST_0_ATMEL_SAM_GPIO
+GPIO_SAM_DEVICE_INIT(0);
+#endif
 
-static struct gpio_sam_runtime port_e_sam_runtime;
+#if DT_INST_1_ATMEL_SAM_GPIO
+GPIO_SAM_DEVICE_INIT(1);
+#endif
 
-DEVICE_AND_API_INIT(port_e_sam, DT_GPIO_SAM_PORTE_LABEL, gpio_sam_init,
-		    &port_e_sam_runtime, &port_e_sam_config, POST_KERNEL,
-		    CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &gpio_sam_api);
+#if DT_INST_2_ATMEL_SAM_GPIO
+GPIO_SAM_DEVICE_INIT(2);
+#endif
 
-static void port_e_sam_config_func(struct device *dev)
-{
-	IRQ_CONNECT(DT_GPIO_SAM_PORTE_IRQ, DT_GPIO_SAM_PORTE_IRQ_PRIO,
-		    gpio_sam_isr, DEVICE_GET(port_e_sam), 0);
-	irq_enable(DT_GPIO_SAM_PORTE_IRQ);
-}
+#if DT_INST_3_ATMEL_SAM_GPIO
+GPIO_SAM_DEVICE_INIT(3);
+#endif
 
-#endif /* DT_GPIO_SAM_PORTE_BASE_ADDRESS */
+#if DT_INST_4_ATMEL_SAM_GPIO
+GPIO_SAM_DEVICE_INIT(4);
+#endif
diff --git a/samples/drivers/lcd_hd44780/src/main.c b/samples/drivers/lcd_hd44780/src/main.c
@@ -72,7 +72,7 @@
 
 
 #if defined(CONFIG_SOC_PART_NUMBER_SAM3X8E)
-#define GPIO_DRV_NAME DT_GPIO_SAM_PORTC_LABEL
+#define GPIO_DRV_NAME DT_ATMEL_SAM_GPIO_400E1200_LABEL
 #else
 #error "Unsupported GPIO driver"
 #endif

diff --git a/soc/arm/atmel_sam/sam3x/dts_fixup.h b/soc/arm/atmel_sam/sam3x/dts_fixup.h
@@ -10,32 +10,6 @@
 
 #define DT_NUM_IRQ_PRIO_BITS	DT_ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS
 
-#define DT_GPIO_SAM_PORTA_LABEL		DT_ATMEL_SAM_GPIO_400E0E00_LABEL
-#define DT_GPIO_SAM_PORTA_BASE_ADDRESS	DT_ATMEL_SAM_GPIO_400E0E00_BASE_ADDRESS
-#define DT_GPIO_SAM_PORTA_IRQ		DT_ATMEL_SAM_GPIO_400E0E00_IRQ_0
-#define DT_GPIO_SAM_PORTA_IRQ_PRIO	DT_ATMEL_SAM_GPIO_400E0E00_IRQ_0_PRIORITY
-#define DT_GPIO_SAM_PORTA_PERIPHERAL_ID	DT_ATMEL_SAM_GPIO_400E0E00_PERIPHERAL_ID
-#define DT_GPIO_SAM_PORTB_LABEL		DT_ATMEL_SAM_GPIO_400E1000_LABEL
-#define DT_GPIO_SAM_PORTB_BASE_ADDRESS	DT_ATMEL_SAM_GPIO_400E1000_BASE_ADDRESS
-#define DT_GPIO_SAM_PORTB_IRQ		DT_ATMEL_SAM_GPIO_400E1000_IRQ_0
-#define DT_GPIO_SAM_PORTB_IRQ_PRIO	DT_ATMEL_SAM_GPIO_400E1000_IRQ_0_PRIORITY
-#define DT_GPIO_SAM_PORTB_PERIPHERAL_ID	DT_ATMEL_SAM_GPIO_400E1000_PERIPHERAL_ID
-#define DT_GPIO_SAM_PORTC_LABEL		DT_ATMEL_SAM_GPIO_400E1200_LABEL
-#define DT_GPIO_SAM_PORTC_BASE_ADDRESS	DT_ATMEL_SAM_GPIO_400E1200_BASE_ADDRESS
-#define DT_GPIO_SAM_PORTC_IRQ		DT_ATMEL_SAM_GPIO_400E1200_IRQ_0
-#define DT_GPIO_SAM_PORTC_IRQ_PRIO	DT_ATMEL_SAM_GPIO_400E1200_IRQ_0_PRIORITY
-#define DT_GPIO_SAM_PORTC_PERIPHERAL_ID	DT_ATMEL_SAM_GPIO_400E1200_PERIPHERAL_ID
-#define DT_GPIO_SAM_PORTD_LABEL		DT_ATMEL_SAM_GPIO_400E1400_LABEL
-#define DT_GPIO_SAM_PORTD_BASE_ADDRESS	DT_ATMEL_SAM_GPIO_400E1400_BASE_ADDRESS
-#define DT_GPIO_SAM_PORTD_IRQ		DT_ATMEL_SAM_GPIO_400E1400_IRQ_0
-#define DT_GPIO_SAM_PORTD_IRQ_PRIO	DT_ATMEL_SAM_GPIO_400E1400_IRQ_0_PRIORITY
-#define DT_GPIO_SAM_PORTD_PERIPHERAL_ID	DT_ATMEL_SAM_GPIO_400E1400_PERIPHERAL_ID
-#define DT_GPIO_SAM_PORTE_LABEL		DT_ATMEL_SAM_GPIO_400E1600_LABEL
-#define DT_GPIO_SAM_PORTE_BASE_ADDRESS	DT_ATMEL_SAM_GPIO_400E1600_BASE_ADDRESS
-#define DT_GPIO_SAM_PORTE_IRQ		DT_ATMEL_SAM_GPIO_400E1600_IRQ_0
-#define DT_GPIO_SAM_PORTE_IRQ_PRIO	DT_ATMEL_SAM_GPIO_400E1600_IRQ_0_PRIORITY
-#define DT_GPIO_SAM_PORTE_PERIPHERAL_ID	DT_ATMEL_SAM_GPIO_400E1600_PERIPHERAL_ID
-
 #define DT_I2C_0_BASE_ADDRESS	DT_ATMEL_SAM_I2C_TWI_4008C000_BASE_ADDRESS
 #define DT_I2C_0_NAME		DT_ATMEL_SAM_I2C_TWI_4008C000_LABEL
 #define DT_I2C_0_BITRATE		DT_ATMEL_SAM_I2C_TWI_4008C000_CLOCK_FREQUENCY

diff --git a/soc/arm/atmel_sam/sam4e/dts_fixup.h b/soc/arm/atmel_sam/sam4e/dts_fixup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Gerson Fernando Budke
+ * Copyright (c) 2019-2020 Gerson Fernando Budke
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -13,32 +13,6 @@
 
 #define DT_NUM_IRQ_PRIO_BITS                 DT_ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS
 
-#define DT_GPIO_SAM_PORTA_LABEL              DT_ATMEL_SAM_GPIO_400E0E00_LABEL
-#define DT_GPIO_SAM_PORTA_BASE_ADDRESS       DT_ATMEL_SAM_GPIO_400E0E00_BASE_ADDRESS
-#define DT_GPIO_SAM_PORTA_IRQ                DT_ATMEL_SAM_GPIO_400E0E00_IRQ_0
-#define DT_GPIO_SAM_PORTA_IRQ_PRIO           DT_ATMEL_SAM_GPIO_400E0E00_IRQ_0_PRIORITY
-#define DT_GPIO_SAM_PORTA_PERIPHERAL_ID      DT_ATMEL_SAM_GPIO_400E0E00_PERIPHERAL_ID
-#define DT_GPIO_SAM_PORTB_LABEL              DT_ATMEL_SAM_GPIO_400E1000_LABEL
-#define DT_GPIO_SAM_PORTB_BASE_ADDRESS       DT_ATMEL_SAM_GPIO_400E1000_BASE_ADDRESS
-#define DT_GPIO_SAM_PORTB_IRQ                DT_ATMEL_SAM_GPIO_400E1000_IRQ_0
-#define DT_GPIO_SAM_PORTB_IRQ_PRIO           DT_ATMEL_SAM_GPIO_400E1000_IRQ_0_PRIORITY
-#define DT_GPIO_SAM_PORTB_PERIPHERAL_ID      DT_ATMEL_SAM_GPIO_400E1000_PERIPHERAL_ID
-#define DT_GPIO_SAM_PORTC_LABEL              DT_ATMEL_SAM_GPIO_400E1200_LABEL
-#define DT_GPIO_SAM_PORTC_BASE_ADDRESS       DT_ATMEL_SAM_GPIO_400E1200_BASE_ADDRESS
-#define DT_GPIO_SAM_PORTC_IRQ                DT_ATMEL_SAM_GPIO_400E1200_IRQ_0
-#define DT_GPIO_SAM_PORTC_IRQ_PRIO           DT_ATMEL_SAM_GPIO_400E1200_IRQ_0_PRIORITY
-#define DT_GPIO_SAM_PORTC_PERIPHERAL_ID      DT_ATMEL_SAM_GPIO_400E1200_PERIPHERAL_ID
-#define DT_GPIO_SAM_PORTD_LABEL              DT_ATMEL_SAM_GPIO_400E1400_LABEL
-#define DT_GPIO_SAM_PORTD_BASE_ADDRESS       DT_ATMEL_SAM_GPIO_400E1400_BASE_ADDRESS
-#define DT_GPIO_SAM_PORTD_IRQ                DT_ATMEL_SAM_GPIO_400E1400_IRQ_0
-#define DT_GPIO_SAM_PORTD_IRQ_PRIO           DT_ATMEL_SAM_GPIO_400E1400_IRQ_0_PRIORITY
-#define DT_GPIO_SAM_PORTD_PERIPHERAL_ID      DT_ATMEL_SAM_GPIO_400E1400_PERIPHERAL_ID
-#define DT_GPIO_SAM_PORTE_LABEL              DT_ATMEL_SAM_GPIO_400E1600_LABEL
-#define DT_GPIO_SAM_PORTE_BASE_ADDRESS       DT_ATMEL_SAM_GPIO_400E1600_BASE_ADDRESS
-#define DT_GPIO_SAM_PORTE_IRQ                DT_ATMEL_SAM_GPIO_400E1600_IRQ_0
-#define DT_GPIO_SAM_PORTE_IRQ_PRIO           DT_ATMEL_SAM_GPIO_400E1600_IRQ_0_PRIORITY
-#define DT_GPIO_SAM_PORTE_PERIPHERAL_ID      DT_ATMEL_SAM_GPIO_400E1600_PERIPHERAL_ID
-
 #define DT_I2C_0_BASE_ADDRESS                DT_ATMEL_SAM_I2C_TWI_400A8000_BASE_ADDRESS
 #define DT_I2C_0_NAME                        DT_ATMEL_SAM_I2C_TWI_400A8000_LABEL
 #define DT_I2C_0_BITRATE                     DT_ATMEL_SAM_I2C_TWI_400A8000_CLOCK_FREQUENCY

diff --git a/soc/arm/atmel_sam/sam4s/dts_fixup.h b/soc/arm/atmel_sam/sam4s/dts_fixup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Gerson Fernando Budke
+ * Copyright (c) 2019-2020 Gerson Fernando Budke
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -14,22 +14,6 @@
 
 #define DT_NUM_IRQ_PRIO_BITS	DT_ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS
 
-#define DT_GPIO_SAM_PORTA_LABEL	DT_ATMEL_SAM_GPIO_400E0E00_LABEL
-#define DT_GPIO_SAM_PORTA_BASE_ADDRESS	DT_ATMEL_SAM_GPIO_400E0E00_BASE_ADDRESS
-#define DT_GPIO_SAM_PORTA_IRQ	DT_ATMEL_SAM_GPIO_400E0E00_IRQ_0
-#define DT_GPIO_SAM_PORTA_IRQ_PRIO	DT_ATMEL_SAM_GPIO_400E0E00_IRQ_0_PRIORITY
-#define DT_GPIO_SAM_PORTA_PERIPHERAL_ID	DT_ATMEL_SAM_GPIO_400E0E00_PERIPHERAL_ID
-#define DT_GPIO_SAM_PORTB_LABEL	DT_ATMEL_SAM_GPIO_400E1000_LABEL
-#define DT_GPIO_SAM_PORTB_BASE_ADDRESS	DT_ATMEL_SAM_GPIO_400E1000_BASE_ADDRESS
-#define DT_GPIO_SAM_PORTB_IRQ	DT_ATMEL_SAM_GPIO_400E1000_IRQ_0
-#define DT_GPIO_SAM_PORTB_IRQ_PRIO	DT_ATMEL_SAM_GPIO_400E1000_IRQ_0_PRIORITY
-#define DT_GPIO_SAM_PORTB_PERIPHERAL_ID	DT_ATMEL_SAM_GPIO_400E1000_PERIPHERAL_ID
-#define DT_GPIO_SAM_PORTC_LABEL	DT_ATMEL_SAM_GPIO_400E1200_LABEL
-#define DT_GPIO_SAM_PORTC_BASE_ADDRESS	DT_ATMEL_SAM_GPIO_400E1200_BASE_ADDRESS
-#define DT_GPIO_SAM_PORTC_IRQ	DT_ATMEL_SAM_GPIO_400E1200_IRQ_0
-#define DT_GPIO_SAM_PORTC_IRQ_PRIO	DT_ATMEL_SAM_GPIO_400E1200_IRQ_0_PRIORITY
-#define DT_GPIO_SAM_PORTC_PERIPHERAL_ID	DT_ATMEL_SAM_GPIO_400E1200_PERIPHERAL_ID
-
 #define DT_I2C_0_BASE_ADDRESS	DT_ATMEL_SAM_I2C_TWI_40018000_BASE_ADDRESS
 #define DT_I2C_0_NAME		DT_ATMEL_SAM_I2C_TWI_40018000_LABEL
 #define DT_I2C_0_BITRATE		DT_ATMEL_SAM_I2C_TWI_40018000_CLOCK_FREQUENCY

diff --git a/soc/arm/atmel_sam/same70/dts_fixup.h b/soc/arm/atmel_sam/same70/dts_fixup.h
@@ -13,32 +13,6 @@
 
 #define DT_NUM_MPU_REGIONS		DT_ARM_ARMV7M_MPU_E000ED90_ARM_NUM_MPU_REGIONS
 
-#define DT_GPIO_SAM_PORTA_LABEL	DT_ATMEL_SAM_GPIO_400E0E00_LABEL
-#define DT_GPIO_SAM_PORTA_BASE_ADDRESS	DT_ATMEL_SAM_GPIO_400E0E00_BASE_ADDRESS
-#define DT_GPIO_SAM_PORTA_IRQ	DT_ATMEL_SAM_GPIO_400E0E00_IRQ_0
-#define DT_GPIO_SAM_PORTA_IRQ_PRIO	DT_ATMEL_SAM_GPIO_400E0E00_IRQ_0_PRIORITY
-#define DT_GPIO_SAM_PORTA_PERIPHERAL_ID	DT_ATMEL_SAM_GPIO_400E0E00_PERIPHERAL_ID
-#define DT_GPIO_SAM_PORTB_LABEL	DT_ATMEL_SAM_GPIO_400E1000_LABEL
-#define DT_GPIO_SAM_PORTB_BASE_ADDRESS	DT_ATMEL_SAM_GPIO_400E1000_BASE_ADDRESS
-#define DT_GPIO_SAM_PORTB_IRQ	DT_ATMEL_SAM_GPIO_400E1000_IRQ_0
-#define DT_GPIO_SAM_PORTB_IRQ_PRIO	DT_ATMEL_SAM_GPIO_400E1000_IRQ_0_PRIORITY
-#define DT_GPIO_SAM_PORTB_PERIPHERAL_ID	DT_ATMEL_SAM_GPIO_400E1000_PERIPHERAL_ID
-#define DT_GPIO_SAM_PORTC_LABEL	DT_ATMEL_SAM_GPIO_400E1200_LABEL
-#define DT_GPIO_SAM_PORTC_BASE_ADDRESS	DT_ATMEL_SAM_GPIO_400E1200_BASE_ADDRESS
-#define DT_GPIO_SAM_PORTC_IRQ	DT_ATMEL_SAM_GPIO_400E1200_IRQ_0
-#define DT_GPIO_SAM_PORTC_IRQ_PRIO	DT_ATMEL_SAM_GPIO_400E1200_IRQ_0_PRIORITY
-#define DT_GPIO_SAM_PORTC_PERIPHERAL_ID	DT_ATMEL_SAM_GPIO_400E1200_PERIPHERAL_ID
-#define DT_GPIO_SAM_PORTD_LABEL	DT_ATMEL_SAM_GPIO_400E1400_LABEL
-#define DT_GPIO_SAM_PORTD_BASE_ADDRESS	DT_ATMEL_SAM_GPIO_400E1400_BASE_ADDRESS
-#define DT_GPIO_SAM_PORTD_IRQ	DT_ATMEL_SAM_GPIO_400E1400_IRQ_0
-#define DT_GPIO_SAM_PORTD_IRQ_PRIO	DT_ATMEL_SAM_GPIO_400E1400_IRQ_0_PRIORITY
-#define DT_GPIO_SAM_PORTD_PERIPHERAL_ID	DT_ATMEL_SAM_GPIO_400E1400_PERIPHERAL_ID
-#define DT_GPIO_SAM_PORTE_LABEL	DT_ATMEL_SAM_GPIO_400E1600_LABEL
-#define DT_GPIO_SAM_PORTE_BASE_ADDRESS	DT_ATMEL_SAM_GPIO_400E1600_BASE_ADDRESS
-#define DT_GPIO_SAM_PORTE_IRQ	DT_ATMEL_SAM_GPIO_400E1600_IRQ_0
-#define DT_GPIO_SAM_PORTE_IRQ_PRIO	DT_ATMEL_SAM_GPIO_400E1600_IRQ_0_PRIORITY
-#define DT_GPIO_SAM_PORTE_PERIPHERAL_ID	DT_ATMEL_SAM_GPIO_400E1600_PERIPHERAL_ID
-
 #define DT_I2C_0_BASE_ADDRESS	DT_ATMEL_SAM_I2C_TWIHS_40018000_BASE_ADDRESS
 #define DT_I2C_0_NAME		DT_ATMEL_SAM_I2C_TWIHS_40018000_LABEL
 #define DT_I2C_0_BITRATE		DT_ATMEL_SAM_I2C_TWIHS_40018000_CLOCK_FREQUENCY

diff --git a/soc/arm/atmel_sam/samv71/dts_fixup.h b/soc/arm/atmel_sam/samv71/dts_fixup.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Gerson Fernando Budke
+ * Copyright (c) 2019-2020 Gerson Fernando Budke
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -17,32 +17,6 @@
 
 #define DT_NUM_MPU_REGIONS                   DT_ARM_ARMV7M_MPU_E000ED90_ARM_NUM_MPU_REGIONS
 
-#define DT_GPIO_SAM_PORTA_LABEL              DT_ATMEL_SAM_GPIO_400E0E00_LABEL
-#define DT_GPIO_SAM_PORTA_BASE_ADDRESS       DT_ATMEL_SAM_GPIO_400E0E00_BASE_ADDRESS
-#define DT_GPIO_SAM_PORTA_IRQ                DT_ATMEL_SAM_GPIO_400E0E00_IRQ_0
-#define DT_GPIO_SAM_PORTA_IRQ_PRIO           DT_ATMEL_SAM_GPIO_400E0E00_IRQ_0_PRIORITY
-#define DT_GPIO_SAM_PORTA_PERIPHERAL_ID      DT_ATMEL_SAM_GPIO_400E0E00_PERIPHERAL_ID
-#define DT_GPIO_SAM_PORTB_LABEL              DT_ATMEL_SAM_GPIO_400E1000_LABEL
-#define DT_GPIO_SAM_PORTB_BASE_ADDRESS       DT_ATMEL_SAM_GPIO_400E1000_BASE_ADDRESS
-#define DT_GPIO_SAM_PORTB_IRQ                DT_ATMEL_SAM_GPIO_400E1000_IRQ_0
-#define DT_GPIO_SAM_PORTB_IRQ_PRIO           DT_ATMEL_SAM_GPIO_400E1000_IRQ_0_PRIORITY
-#define DT_GPIO_SAM_PORTB_PERIPHERAL_ID      DT_ATMEL_SAM_GPIO_400E1000_PERIPHERAL_ID
-#define DT_GPIO_SAM_PORTC_LABEL              DT_ATMEL_SAM_GPIO_400E1200_LABEL
-#define DT_GPIO_SAM_PORTC_BASE_ADDRESS       DT_ATMEL_SAM_GPIO_400E1200_BASE_ADDRESS
-#define DT_GPIO_SAM_PORTC_IRQ                DT_ATMEL_SAM_GPIO_400E1200_IRQ_0
-#define DT_GPIO_SAM_PORTC_IRQ_PRIO           DT_ATMEL_SAM_GPIO_400E1200_IRQ_0_PRIORITY
-#define DT_GPIO_SAM_PORTC_PERIPHERAL_ID      DT_ATMEL_SAM_GPIO_400E1200_PERIPHERAL_ID
-#define DT_GPIO_SAM_PORTD_LABEL              DT_ATMEL_SAM_GPIO_400E1400_LABEL
-#define DT_GPIO_SAM_PORTD_BASE_ADDRESS       DT_ATMEL_SAM_GPIO_400E1400_BASE_ADDRESS
-#define DT_GPIO_SAM_PORTD_IRQ                DT_ATMEL_SAM_GPIO_400E1400_IRQ_0
-#define DT_GPIO_SAM_PORTD_IRQ_PRIO           DT_ATMEL_SAM_GPIO_400E1400_IRQ_0_PRIORITY
-#define DT_GPIO_SAM_PORTD_PERIPHERAL_ID      DT_ATMEL_SAM_GPIO_400E1400_PERIPHERAL_ID
-#define DT_GPIO_SAM_PORTE_LABEL              DT_ATMEL_SAM_GPIO_400E1600_LABEL
-#define DT_GPIO_SAM_PORTE_BASE_ADDRESS       DT_ATMEL_SAM_GPIO_400E1600_BASE_ADDRESS
-#define DT_GPIO_SAM_PORTE_IRQ                DT_ATMEL_SAM_GPIO_400E1600_IRQ_0
-#define DT_GPIO_SAM_PORTE_IRQ_PRIO           DT_ATMEL_SAM_GPIO_400E1600_IRQ_0_PRIORITY
-#define DT_GPIO_SAM_PORTE_PERIPHERAL_ID      DT_ATMEL_SAM_GPIO_400E1600_PERIPHERAL_ID
-
 #define DT_I2C_0_BASE_ADDRESS                DT_ATMEL_SAM_I2C_TWIHS_40018000_BASE_ADDRESS
 #define DT_I2C_0_NAME                        DT_ATMEL_SAM_I2C_TWIHS_40018000_LABEL
 #define DT_I2C_0_BITRATE                     DT_ATMEL_SAM_I2C_TWIHS_40018000_CLOCK_FREQUENCY