From fa63671ff7ea62b3a157061b4dcef879ca2114b6 Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Thu, 16 Dec 2021 10:51:28 +0100 Subject: [PATCH] drivers: i2s: mcux_sai: use instance based macros Replace usages of DT_DRV_INST with instance based macros. Signed-off-by: Gerard Marull-Paretas --- drivers/i2s/i2s_mcux_sai.c | 49 +++++++++++++++----------------------- 1 file changed, 19 insertions(+), 30 deletions(-) diff --git a/drivers/i2s/i2s_mcux_sai.c b/drivers/i2s/i2s_mcux_sai.c index 05d4c487297..35a4f92fe1d 100644 --- a/drivers/i2s/i2s_mcux_sai.c +++ b/drivers/i2s/i2s_mcux_sai.c @@ -1097,40 +1097,29 @@ static const struct i2s_driver_api i2s_mcux_driver_api = { \ static const struct i2s_mcux_config i2s_##i2s_id##_config = { \ .base = (I2S_Type *)DT_INST_REG_ADDR(i2s_id), \ - .clk_src = \ - DT_CLOCKS_CELL_BY_IDX(DT_DRV_INST(i2s_id), \ - 0, bits), \ + .clk_src = DT_INST_CLOCKS_CELL_BY_IDX(i2s_id, 0, bits), \ .clk_pre_div = DT_INST_PROP(i2s_id, pre_div); \ .clk_src_div = DT_INST_PROP(i2s_id, podf); \ - .pll_src = \ - DT_PHA_BY_NAME(DT_DRV_INST(i2s_id), \ - pll_clocks, src, value), \ - .pll_lp = \ - DT_PHA_BY_NAME(DT_DRV_INST(i2s_id), \ - pll_clocks, lp, value), \ - .pll_pd = \ - DT_PHA_BY_NAME(DT_DRV_INST(i2s_id), \ - pll_clocks, pd, value), \ - .pll_num = \ - DT_PHA_BY_NAME(DT_DRV_INST(i2s_id), \ - pll_clocks, num, value), \ - .pll_den = \ - DT_PHA_BY_NAME(DT_DRV_INST(i2s_id), \ - pll_clocks, den, value), \ - .mclk_pin_mask = \ - DT_PHA_BY_IDX(DT_DRV_INST(i2s_id), \ - pinmuxes, 0, function), \ - .mclk_pin_offset = \ - DT_PHA_BY_IDX(DT_DRV_INST(i2s_id), \ - pinmuxs, 0, pin), \ + .pll_src = DT_INST_PHA_BY_NAME(i2s_id, pll_clocks, src, \ + value), \ + .pll_lp = DT_INST_PHA_BY_NAME(i2s_id, pll_clocks, lp, \ + value), \ + .pll_pd = DT_INST_PHA_BY_NAME(i2s_id, pll_clocks, pd, \ + value), \ + .pll_num = DT_INST_PHA_BY_NAME(i2s_id, pll_clocks, num, \ + value), \ + .pll_den = DT_INST_PHA_BY_NAME(i2s_id, pll_clocks, den, \ + value), \ + .mclk_pin_mask = DT_INST_PHA_BY_IDX(i2s_id, pinmuxes, \ + 0, function), \ + .mclk_pin_offset = DT_INST_PHA_BY_IDX(i2s_id, pinmuxs, \ + 0, pin), \ .clk_sub_sys = (clock_control_subsys_t) \ - DT_CLOCKS_CELL_BY_IDX(DT_DRV_INST(i2s_id), \ - 0, name), \ - .ccm_dev = DEVICE_DT_GET( \ - DT_CLOCKS_CTLR(DT_DRV_INST(i2s_id))), \ + DT_INST_CLOCKS_CELL_BY_IDX(i2s_id, 0, name), \ + .ccm_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(i2s_id)), \ .pinmux_dev = DEVICE_DT_GET( \ - DT_PHANDLE_BY_IDX(DT_DRV_INST(i2s_id), \ - pinmuxes, 0)), \ + DT_INST_PHANDLE_BY_IDX(i2s_id, pinmuxes,\ + 0)), \ .irq_connect = i2s_irq_connect_##i2s_id, \ .tx_sync_mode = \ DT_INST_PROP(i2s_id, nxp_tx_sync_mode), \