michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dts: Convert from DT_<COMPAT>_<INSTANCE>_<PROP> to DT_INST...

Browse source 
Change code from using now deprecated DT_<COMPAT>_<INSTANCE>_<PROP>
defines to using DT_INST_<INSTANCE>_<COMPAT>_<PROP>.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2019-06-11 14:20:32 -05:00 • committed by Kumar Gala
commit a2693975d7
206 changed files with 1480 additions and 1479 deletions
Download patch file Download diff file Expand all files Collapse all files

14
drivers/pwm/pwm_nrf5_sw.c
View file

@ -14,13 +14,13 @@
LOG_MODULE_REGISTER(pwm_nrf5_sw);
/* One compare channel is needed to set the PWM period, hence +1. */
#if ((DT_NORDIC_NRF_SW_PWM_0_CHANNEL_COUNT + 1) > \
#if ((DT_INST_0_NORDIC_NRF_SW_PWM_CHANNEL_COUNT + 1) > \
(_CONCAT( \
_CONCAT(TIMER, DT_NORDIC_NRF_SW_PWM_0_TIMER_INSTANCE), \
_CONCAT(TIMER, DT_INST_0_NORDIC_NRF_SW_PWM_TIMER_INSTANCE), \
_CC_NUM)))
#error "Invalid number of PWM channels configured."
#endif
#define PWM_0_MAP_SIZE DT_NORDIC_NRF_SW_PWM_0_CHANNEL_COUNT
#define PWM_0_MAP_SIZE DT_INST_0_NORDIC_NRF_SW_PWM_CHANNEL_COUNT
struct pwm_config {
NRF_TIMER_Type *timer;
@ -245,11 +245,11 @@ static int pwm_nrf5_sw_init(struct device *dev)
}
static const struct pwm_config pwm_nrf5_sw_0_config = {
.timer = _CONCAT(NRF_TIMER, DT_NORDIC_NRF_SW_PWM_0_TIMER_INSTANCE),
.ppi_base = DT_NORDIC_NRF_SW_PWM_0_PPI_BASE,
.gpiote_base = DT_NORDIC_NRF_SW_PWM_0_GPIOTE_BASE,
.timer = _CONCAT(NRF_TIMER, DT_INST_0_NORDIC_NRF_SW_PWM_TIMER_INSTANCE),
.ppi_base = DT_INST_0_NORDIC_NRF_SW_PWM_PPI_BASE,
.gpiote_base = DT_INST_0_NORDIC_NRF_SW_PWM_GPIOTE_BASE,
.map_size = PWM_0_MAP_SIZE,
.prescaler = DT_NORDIC_NRF_SW_PWM_0_CLOCK_PRESCALER,
.prescaler = DT_INST_0_NORDIC_NRF_SW_PWM_CLOCK_PRESCALER,
};
static struct pwm_data pwm_nrf5_sw_0_data;