From 831332068b22ef0c956761cc2702df7378387bf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=AD=20Bol=C3=ADvar?= Date: Thu, 12 Aug 2021 07:24:08 -0700 Subject: [PATCH] pwm: it8xxx2: use new DT pinctrl accessors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update to use the new APIs. Signed-off-by: Martí Bolívar --- drivers/i2c/i2c_ite_it8xxx2.c | 5 +++-- drivers/pwm/pwm_ite_it8xxx2.c | 6 ++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/i2c_ite_it8xxx2.c b/drivers/i2c/i2c_ite_it8xxx2.c index 44a6d5536ab..5d3acc026cb 100644 --- a/drivers/i2c/i2c_ite_it8xxx2.c +++ b/drivers/i2c/i2c_ite_it8xxx2.c @@ -1019,8 +1019,9 @@ static const struct i2c_driver_api i2c_it8xxx2_driver_api = { #define I2C_ITE_IT8XXX2_INIT(idx) \ static void i2c_it8xxx2_config_func_##idx(void); \ - static const struct i2c_alts_cfg i2c_alts_##idx[DT_INST_PROP_LEN \ - (idx, pinctrl_0)] = IT8XXX2_DT_ALT_ITEMS_LIST(idx); \ + static const struct i2c_alts_cfg \ + i2c_alts_##idx[DT_INST_NUM_PINCTRLS_BY_IDX(idx, 0)] = \ + IT8XXX2_DT_ALT_ITEMS_LIST(idx); \ \ static const struct i2c_it8xxx2_config i2c_it8xxx2_cfg_##idx = { \ .base = (uint8_t *)(DT_INST_REG_ADDR(idx)), \ diff --git a/drivers/pwm/pwm_ite_it8xxx2.c b/drivers/pwm/pwm_ite_it8xxx2.c index c8ded9d605e..3cb600699f9 100644 --- a/drivers/pwm/pwm_ite_it8xxx2.c +++ b/drivers/pwm/pwm_ite_it8xxx2.c @@ -51,10 +51,8 @@ struct pwm_it8xxx2_cfg { #define DRV_REG(dev) (struct pwm_it8xxx2_regs *)(DRV_CONFIG(dev)->base) #define DEV_PINMUX(inst) \ DEVICE_DT_GET(DT_PHANDLE_BY_IDX(DT_NODELABEL(pinctrl_pwm##inst), pinctrls, 0)) -#define DEV_PIN(inst) \ - DT_PHA(DT_PHANDLE_BY_IDX(DT_DRV_INST(inst), pinctrl_0, 0), pinctrls, pin) -#define DEV_ALT_FUN(inst) \ - DT_PHA(DT_PHANDLE_BY_IDX(DT_DRV_INST(inst), pinctrl_0, 0), pinctrls, alt_func) +#define DEV_PIN(inst) DT_PHA(DT_INST_PINCTRL_0(inst, 0), pinctrls, pin) +#define DEV_ALT_FUN(inst) DT_PHA(DT_INST_PINCTRL_0(inst, 0), pinctrls, alt_func) static void pwm_enable(const struct device *dev, int enabled) {