diff --git a/boards/arm/nrf52_pca20020/board.c b/boards/arm/nrf52_pca20020/board.c
index 4194c333205..754e0b08b8a 100644
--- a/boards/arm/nrf52_pca20020/board.c
+++ b/boards/arm/nrf52_pca20020/board.c
@@ -67,7 +67,7 @@ DEVICE_INIT(vdd_pwr_ctrl_init, "", pwr_ctrl_init, NULL, &vdd_pwr_ctrl_cfg,
 #endif
 
 static const struct pwr_ctrl_cfg ccs_vdd_pwr_ctrl_cfg = {
-	.port = CONFIG_GPIO_SX1509B_DEV_NAME,
+	.port = DT_SEMTECH_SX1509B_0_LABEL,
 	.pin = CCS_VDD_PWR_CTRL_GPIO_PIN,
 };
 
diff --git a/boards/arm/nrf52_pca20020/dts_fixup.h b/boards/arm/nrf52_pca20020/dts_fixup.h
deleted file mode 100644
index 4fb49a90677..00000000000
--- a/boards/arm/nrf52_pca20020/dts_fixup.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define CONFIG_GPIO_SX1509B_DEV_NAME		DT_NORDIC_NRF_I2C_40003000_SEMTECH_SX1509B_3E_LABEL
-#define CONFIG_GPIO_SX1509B_I2C_ADDR		DT_NORDIC_NRF_I2C_40003000_SEMTECH_SX1509B_3E_BASE_ADDRESS
-#define CONFIG_GPIO_SX1509B_I2C_MASTER_DEV_NAME	DT_NORDIC_NRF_I2C_40003000_SEMTECH_SX1509B_3E_BUS_NAME
diff --git a/drivers/gpio/gpio_sx1509b.c b/drivers/gpio/gpio_sx1509b.c
index fb0270364df..64e6edc32c3 100644
--- a/drivers/gpio/gpio_sx1509b.c
+++ b/drivers/gpio/gpio_sx1509b.c
@@ -14,6 +14,12 @@
 #include <misc/byteorder.h>
 #include <misc/util.h>
 
+#ifdef CONFIG_HAS_DTS_I2C
+#define CONFIG_GPIO_SX1509B_DEV_NAME	DT_SEMTECH_SX1509B_0_LABEL
+#define CONFIG_GPIO_SX1509B_I2C_ADDR	DT_SEMTECH_SX1509B_0_BASE_ADDRESS
+#define CONFIG_GPIO_SX1509B_I2C_MASTER_DEV_NAME DT_SEMTECH_SX1509B_0_BUS_NAME
+#endif
+
 /** Cache of the output configuration and data of the pins */
 struct gpio_sx1509b_pin_state {
 	u16_t input_disable;
diff --git a/tests/drivers/build_all/dts_fixup.h b/tests/drivers/build_all/dts_fixup.h
index 482c9874c75..0f10be58185 100644
--- a/tests/drivers/build_all/dts_fixup.h
+++ b/tests/drivers/build_all/dts_fixup.h
@@ -90,10 +90,10 @@
 #define DT_MAX_MAX30101_0_LABEL ""
 #endif
 
-#ifndef CONFIG_GPIO_SX1509B_DEV_NAME
-#define CONFIG_GPIO_SX1509B_DEV_NAME ""
-#define CONFIG_GPIO_SX1509B_I2C_ADDR 0
-#define CONFIG_GPIO_SX1509B_I2C_MASTER_DEV_NAME ""
+#ifndef DT_SEMTECH_SX1509B_0_LABEL
+#define DT_SEMTECH_SX1509B_0_LABEL ""
+#define DT_SEMTECH_SX1509B_0_BASE_ADDRESS 0
+#define DT_SEMTECH_SX1509B_0_BUS_NAME ""
 #endif
 
 #ifndef DT_ST_LSM6DSL_0_LABEL