diff --git a/boards/xtensa/intel_s1000_crb/dts_fixup.h b/boards/xtensa/intel_s1000_crb/dts_fixup.h
index 5dcc4c73f08..16806c850ed 100644
--- a/boards/xtensa/intel_s1000_crb/dts_fixup.h
+++ b/boards/xtensa/intel_s1000_crb/dts_fixup.h
@@ -6,24 +6,6 @@
 
 /* Board level DTS fixup file */
 
-#define DT_CODEC_I2C_BUS_NAME		\
-	DT_SNPS_DESIGNWARE_I2C_80400_TI_TLV320DAC_18_BUS_NAME
-
-#define DT_CODEC_I2C_BUS_ADDR		\
-	DT_SNPS_DESIGNWARE_I2C_80400_TI_TLV320DAC_18_BASE_ADDRESS
-
-#define DT_CODEC_NAME			\
-	DT_SNPS_DESIGNWARE_I2C_80400_TI_TLV320DAC_18_LABEL
-
-#define DT_CODEC_RESET_GPIO_NAME	\
-	DT_SNPS_DESIGNWARE_I2C_80400_TI_TLV320DAC_18_RESET_GPIOS_CONTROLLER
-
-#define DT_CODEC_RESET_GPIO_FLAGS	\
-	DT_SNPS_DESIGNWARE_I2C_80400_TI_TLV320DAC_18_RESET_GPIOS_FLAGS
-
-#define DT_CODEC_RESET_GPIO_PIN		\
-	DT_SNPS_DESIGNWARE_I2C_80400_TI_TLV320DAC_18_RESET_GPIOS_PIN
-
 #define DT_SPI_NOR_SPI_NAME		\
 	DT_SNPS_DESIGNWARE_SPI_E000_SPI_FLASH_0_BUS_NAME
 
diff --git a/drivers/audio/tlv320dac310x.c b/drivers/audio/tlv320dac310x.c
index 6e8ad22106b..0cf13ba27e5 100644
--- a/drivers/audio/tlv320dac310x.c
+++ b/drivers/audio/tlv320dac310x.c
@@ -41,12 +41,12 @@ struct codec_driver_data {
 
 static struct codec_driver_config codec_device_config = {
 	.i2c_device	= NULL,
-	.i2c_dev_name	= DT_CODEC_I2C_BUS_NAME,
-	.i2c_address	= DT_CODEC_I2C_BUS_ADDR,
+	.i2c_dev_name	= DT_TI_TLV320DAC_0_BUS_NAME,
+	.i2c_address	= DT_TI_TLV320DAC_0_BASE_ADDRESS,
 	.gpio_device	= NULL,
-	.gpio_dev_name	= DT_CODEC_RESET_GPIO_NAME,
-	.gpio_pin	= DT_CODEC_RESET_GPIO_PIN,
-	.gpio_flags	= DT_CODEC_RESET_GPIO_FLAGS,
+	.gpio_dev_name	= DT_TI_TLV320DAC_0_RESET_GPIOS_CONTROLLER,
+	.gpio_pin	= DT_TI_TLV320DAC_0_RESET_GPIOS_PIN,
+	.gpio_flags	= DT_TI_TLV320DAC_0_RESET_GPIOS_FLAGS,
 };
 
 static struct codec_driver_data codec_device_data;
@@ -538,6 +538,6 @@ static const struct audio_codec_api codec_driver_api = {
 	.apply_properties	= codec_apply_properties,
 };
 
-DEVICE_AND_API_INIT(tlv320dac310x, DT_CODEC_NAME, codec_initialize,
+DEVICE_AND_API_INIT(tlv320dac310x, DT_TI_TLV320DAC_0_LABEL, codec_initialize,
 		&codec_device_data, &codec_device_config, POST_KERNEL,
 		CONFIG_AUDIO_CODEC_INIT_PRIORITY, &codec_driver_api);