diff --git a/drivers/wifi/winc1500/wifi_winc1500_nm_bus_wrapper.c b/drivers/wifi/winc1500/wifi_winc1500_nm_bus_wrapper.c
index 7a4ac88d211..0a5ba5f4f17 100644
--- a/drivers/wifi/winc1500/wifi_winc1500_nm_bus_wrapper.c
+++ b/drivers/wifi/winc1500/wifi_winc1500_nm_bus_wrapper.c
@@ -96,32 +96,32 @@ s8_t nm_bus_init(void *pvinit)
 	/* Not implemented */
 #elif defined CONF_WINC_USE_SPI
 	/* setup SPI device */
-	winc1500.spi = device_get_binding(DT_WIFI_WINC1500_SPI_DRV_NAME);
+	winc1500.spi = device_get_binding(DT_ATMEL_WINC1500_0_BUS_NAME);
 	if (!winc1500.spi) {
 		LOG_ERR("spi device binding");
 		return -1;
 	}
 
 	winc1500.spi_cfg.operation = SPI_WORD_SET(8) | SPI_TRANSFER_MSB;
-	winc1500.spi_cfg.frequency = DT_WIFI_WINC1500_SPI_FREQ;
-	winc1500.spi_cfg.slave = DT_WIFI_WINC1500_SPI_SLAVE;
+	winc1500.spi_cfg.frequency = DT_ATMEL_WINC1500_0_SPI_MAX_FREQUENCY;
+	winc1500.spi_cfg.slave = DT_ATMEL_WINC1500_0_BASE_ADDRESS;
 
 #ifdef CONFIG_WIFI_WINC1500_GPIO_SPI_CS
 	cs_ctrl.gpio_dev = device_get_binding(
-		DT_WIFI_WINC1500_GPIO_SPI_CS_DRV_NAME);
+		DT_ATMEL_WINC1500_0_CS_GPIO_CONTROLLER);
 	if (!cs_ctrl.gpio_dev) {
 		LOG_ERR("Unable to get GPIO SPI CS device");
 		return -ENODEV;
 	}
 
-	cs_ctrl.gpio_pin = DT_WIFI_WINC1500_GPIO_SPI_CS_PIN;
+	cs_ctrl.gpio_pin = DT_ATMEL_WINC1500_0_CS_GPIO_PIN;
 	cs_ctrl.delay = 0;
 
 	winc1500.spi_cfg.cs = &cs_ctrl;
 
 	LOG_DBG("SPI GPIO CS configured on %s:%u",
-		    DT_WIFI_WINC1500_GPIO_SPI_CS_DRV_NAME,
-		    DT_WIFI_WINC1500_GPIO_SPI_CS_PIN);
+		    DT_ATMEL_WINC1500_0_CS_GPIO_CONTROLLER,
+		    DT_ATMEL_WINC1500_0_CS_GPIO_PIN);
 #endif /* CONFIG_WIFI_WINC1500_GPIO_SPI_CS */
 
 	nm_bsp_reset();
diff --git a/samples/net/wifi/dts_fixup.h b/samples/net/wifi/dts_fixup.h
deleted file mode 100644
index 9d787427c1c..00000000000
--- a/samples/net/wifi/dts_fixup.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2018 Linaro Limited
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/* Board level DTS fixup file */
-
-#if defined(CONFIG_BOARD_QUARK_SE_C1000_DEVBOARD)
-
-#define DT_WIFI_WINC1500_SPI_DRV_NAME	DT_SNPS_DESIGNWARE_SPI_B0001400_ATMEL_WINC1500_0_BUS_NAME
-#define DT_WIFI_WINC1500_SPI_SLAVE	DT_SNPS_DESIGNWARE_SPI_B0001400_ATMEL_WINC1500_0_BASE_ADDRESS
-#define DT_WIFI_WINC1500_SPI_FREQ	DT_SNPS_DESIGNWARE_SPI_B0001400_ATMEL_WINC1500_0_SPI_MAX_FREQUENCY
-
-#define DT_WIFI_WINC1500_GPIO_SPI_CS_DRV_NAME	DT_SNPS_DESIGNWARE_SPI_B0001400_CS_GPIOS_CONTROLLER
-#define DT_WIFI_WINC1500_GPIO_SPI_CS_PIN	DT_SNPS_DESIGNWARE_SPI_B0001400_CS_GPIOS_PIN
-
-#define DT_WINC1500_GPIO_CHIP_EN_DRV_NAME	DT_SNPS_DESIGNWARE_SPI_B0001400_ATMEL_WINC1500_0_ENABLE_GPIOS_CONTROLLER
-#define DT_WINC1500_GPIO_CHIP_EN		DT_SNPS_DESIGNWARE_SPI_B0001400_ATMEL_WINC1500_0_ENABLE_GPIOS_PIN
-#define DT_WINC1500_GPIO_IRQN_DRV_NAME		DT_SNPS_DESIGNWARE_SPI_B0001400_ATMEL_WINC1500_0_IRQ_GPIOS_CONTROLLER
-#define DT_WINC1500_GPIO_IRQN			DT_SNPS_DESIGNWARE_SPI_B0001400_ATMEL_WINC1500_0_IRQ_GPIOS_PIN
-#define DT_WINC1500_GPIO_RESET_N_DRV_NAME	DT_SNPS_DESIGNWARE_SPI_B0001400_ATMEL_WINC1500_0_RESET_GPIOS_CONTROLLER
-#define DT_WINC1500_GPIO_RESET_N		DT_SNPS_DESIGNWARE_SPI_B0001400_ATMEL_WINC1500_0_RESET_GPIOS_PIN
-
-#endif /* CONFIG_BOARD_QUARK_SE_C1000_DEVBOARD */
diff --git a/samples/net/wifi/src/wifi_test.c b/samples/net/wifi/src/wifi_test.c
index e0790045eed..f260802e924 100644
--- a/samples/net/wifi/src/wifi_test.c
+++ b/samples/net/wifi/src/wifi_test.c
@@ -15,9 +15,9 @@
 
 static
 struct winc1500_gpio_configuration winc1500_gpios[WINC1500_GPIO_IDX_MAX] = {
-	{ .dev = NULL, .pin = DT_WINC1500_GPIO_CHIP_EN },
-	{ .dev = NULL, .pin = DT_WINC1500_GPIO_IRQN },
-	{ .dev = NULL, .pin = DT_WINC1500_GPIO_RESET_N },
+	{ .dev = NULL, .pin = DT_ATMEL_WINC1500_0_ENABLE_GPIOS_PIN },
+	{ .dev = NULL, .pin = DT_ATMEL_WINC1500_0_IRQ_GPIOS_PIN },
+	{ .dev = NULL, .pin = DT_ATMEL_WINC1500_0_RESET_GPIOS_PIN },
 };
 
 struct winc1500_gpio_configuration *winc1500_configure_gpios(void)
@@ -28,9 +28,9 @@ struct winc1500_gpio_configuration *winc1500_configure_gpios(void)
 	const int flags_noint_out = GPIO_DIR_OUT;
 	struct device *gpio_en, *gpio_irq, *gpio_reset;
 
-	gpio_en = device_get_binding(DT_WINC1500_GPIO_CHIP_EN_DRV_NAME);
-	gpio_irq = device_get_binding(DT_WINC1500_GPIO_IRQN_DRV_NAME);
-	gpio_reset = device_get_binding(DT_WINC1500_GPIO_RESET_N_DRV_NAME);
+	gpio_en = device_get_binding(DT_ATMEL_WINC1500_0_ENABLE_GPIOS_CONTROLLER);
+	gpio_irq = device_get_binding(DT_ATMEL_WINC1500_0_IRQ_GPIOS_CONTROLLER);
+	gpio_reset = device_get_binding(DT_ATMEL_WINC1500_0_RESET_GPIOS_CONTROLLER);
 
 	gpio_pin_configure(gpio_en,
 			   winc1500_gpios[WINC1500_GPIO_IDX_CHIP_EN].pin,