diff --git a/boards/arm/96b_argonkey/dts_fixup.h b/boards/arm/96b_argonkey/dts_fixup.h index b35a4f7c752..dc7cd56ffb5 100644 --- a/boards/arm/96b_argonkey/dts_fixup.h +++ b/boards/arm/96b_argonkey/dts_fixup.h @@ -12,6 +12,3 @@ #define CONFIG_LP3943_DEV_NAME DT_ST_STM32_I2C_V1_40005C00_TI_LP3943_60_LABEL #define CONFIG_LP3943_I2C_ADDRESS DT_ST_STM32_I2C_V1_40005C00_TI_LP3943_60_BASE_ADDRESS #define CONFIG_LP3943_I2C_MASTER_DEV_NAME DT_ST_STM32_I2C_V1_40005C00_TI_LP3943_60_BUS_NAME - -#define DT_MPXXDTYY_DEV_NAME DT_ST_STM32_I2S_40015000_ST_MPXXDTYY_0_LABEL -#define DT_MPXXDTYY_MASTER_DEV_NAME DT_ST_STM32_I2S_40015000_ST_MPXXDTYY_0_BUS_NAME diff --git a/drivers/audio/mpxxdtyy.c b/drivers/audio/mpxxdtyy.c index aa538724d6f..f6456fe4472 100644 --- a/drivers/audio/mpxxdtyy.c +++ b/drivers/audio/mpxxdtyy.c @@ -88,10 +88,10 @@ static int mpxxdtyy_initialize(struct device *dev) { struct mpxxdtyy_data *const data = DEV_DATA(dev); - data->comm_master = device_get_binding(DT_MPXXDTYY_MASTER_DEV_NAME); + data->comm_master = device_get_binding(DT_ST_MPXXDTYY_0_BUS_NAME); if (data->comm_master == NULL) { - LOG_ERR("master %s not found", DT_MPXXDTYY_MASTER_DEV_NAME); + LOG_ERR("master %s not found", DT_ST_MPXXDTYY_0_BUS_NAME); return -EINVAL; } @@ -101,6 +101,6 @@ static int mpxxdtyy_initialize(struct device *dev) static struct mpxxdtyy_data mpxxdtyy_data; -DEVICE_AND_API_INIT(mpxxdtyy, DT_MPXXDTYY_DEV_NAME, mpxxdtyy_initialize, +DEVICE_AND_API_INIT(mpxxdtyy, DT_ST_MPXXDTYY_0_LABEL, mpxxdtyy_initialize, &mpxxdtyy_data, NULL, POST_KERNEL, CONFIG_AUDIO_DMIC_INIT_PRIORITY, &mpxxdtyy_driver_api); diff --git a/samples/boards/96b_argonkey/microphone/src/main.c b/samples/boards/96b_argonkey/microphone/src/main.c index 4d9c5a99d20..e84bf72f683 100644 --- a/samples/boards/96b_argonkey/microphone/src/main.c +++ b/samples/boards/96b_argonkey/microphone/src/main.c @@ -121,11 +121,11 @@ void main(void) int ret; - struct device *mic_dev = device_get_binding(DT_MPXXDTYY_DEV_NAME); + struct device *mic_dev = device_get_binding(DT_ST_MPXXDTYY_0_LABEL); if (!mic_dev) { printk("Could not get pointer to %s device\n", - DT_MPXXDTYY_DEV_NAME); + DT_ST_MPXXDTYY_0_LABEL); return; }