patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

drivers: i2c: lpc11u6x: Remove DT_LABEL usage

Browse source 
Remove DT_LABEL usage that is needed for device_get_binding, replace
this with DEVICE_DT_GET.

Signed-off-by: Kumar Gala <galak@kernel.org>
This commit is contained in:
Kumar Gala 2022-06-09 13:31:33 -05:00 committed by Carles Cufí
parent 93f2fedc12
commit 78b1d950be
2 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/i2c/i2c_lpc11u6x.c
View file

@ -32,7 +32,6 @@ static int lpc11u6x_i2c_configure(const struct device *dev,
{ {
const struct lpc11u6x_i2c_config *cfg = dev->config; const struct lpc11u6x_i2c_config *cfg = dev->config;
struct lpc11u6x_i2c_data *data = dev->data; struct lpc11u6x_i2c_data *data = dev->data;
const struct device *clk_dev;
uint32_t speed; uint32_t speed;
int ret; int ret;
uint8_t mux_selection = PINCTRL_STATE_DEFAULT; uint8_t mux_selection = PINCTRL_STATE_DEFAULT;
@ -59,13 +58,8 @@ static int lpc11u6x_i2c_configure(const struct device *dev,
return -ENOTSUP; return -ENOTSUP;
} }
clk_dev = device_get_binding(cfg->clock_drv);
if (!clk_dev) {
return -EINVAL;
}
k_mutex_lock(&data->mutex, K_FOREVER); k_mutex_lock(&data->mutex, K_FOREVER);
lpc11u6x_i2c_set_bus_speed(cfg, clk_dev, speed); lpc11u6x_i2c_set_bus_speed(cfg, cfg->clock_dev, speed);
ret = pinctrl_apply_state(cfg->pincfg, mux_selection); ret = pinctrl_apply_state(cfg->pincfg, mux_selection);
if (ret) { if (ret) {
@ -313,7 +307,6 @@ static int lpc11u6x_i2c_init(const struct device *dev)
{ {
const struct lpc11u6x_i2c_config *cfg = dev->config; const struct lpc11u6x_i2c_config *cfg = dev->config;
struct lpc11u6x_i2c_data *data = dev->data; struct lpc11u6x_i2c_data *data = dev->data;
const struct device *clk_dev;
int err; int err;
err = pinctrl_apply_state(cfg->pincfg, PINCTRL_STATE_DEFAULT); err = pinctrl_apply_state(cfg->pincfg, PINCTRL_STATE_DEFAULT);
@ -322,14 +315,10 @@ static int lpc11u6x_i2c_init(const struct device *dev)
} }
/* Configure clock and de-assert reset for I2Cx */ /* Configure clock and de-assert reset for I2Cx */
clk_dev = device_get_binding(cfg->clock_drv); clock_control_on(cfg->clock_dev, (clock_control_subsys_t) cfg->clkid);
if (!clk_dev) {
return -EINVAL;
}
clock_control_on(clk_dev, (clock_control_subsys_t) cfg->clkid);
/* Configure bus speed. Default is 100KHz */ /* Configure bus speed. Default is 100KHz */
lpc11u6x_i2c_set_bus_speed(cfg, clk_dev, 100000); lpc11u6x_i2c_set_bus_speed(cfg, cfg->clock_dev, 100000);
/* Clear all control bytes and enable I2C interface */ /* Clear all control bytes and enable I2C interface */
cfg->base->con_clr = LPC11U6X_I2C_CONTROL_AA | LPC11U6X_I2C_CONTROL_SI | cfg->base->con_clr = LPC11U6X_I2C_CONTROL_AA | LPC11U6X_I2C_CONTROL_SI |
@ -362,7 +351,7 @@ PINCTRL_DT_INST_DEFINE(idx); \
static const struct lpc11u6x_i2c_config i2c_cfg_##idx = { \ static const struct lpc11u6x_i2c_config i2c_cfg_##idx = { \
.base = \ .base = \
(struct lpc11u6x_i2c_regs *) DT_INST_REG_ADDR(idx), \ (struct lpc11u6x_i2c_regs *) DT_INST_REG_ADDR(idx), \
.clock_drv = DT_LABEL(DT_INST_PHANDLE(idx, clocks)), \ .clock_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(idx)), \
.irq_config_func = lpc11u6x_i2c_isr_config_##idx, \ .irq_config_func = lpc11u6x_i2c_isr_config_##idx, \
.pincfg = PINCTRL_DT_INST_DEV_CONFIG_GET(idx), \ .pincfg = PINCTRL_DT_INST_DEV_CONFIG_GET(idx), \
.clkid = DT_INST_PHA_BY_IDX(idx, clocks, 0, clkid), \ .clkid = DT_INST_PHA_BY_IDX(idx, clocks, 0, clkid), \

2
drivers/i2c/i2c_lpc11u6x.h
View file

@ -69,7 +69,7 @@ struct lpc11u6x_i2c_regs {
struct lpc11u6x_i2c_config { struct lpc11u6x_i2c_config {
struct lpc11u6x_i2c_regs *base; struct lpc11u6x_i2c_regs *base;
char *clock_drv; const struct device *clock_dev;
void (*irq_config_func)(const struct device *dev); void (*irq_config_func)(const struct device *dev);
uint32_t clkid; uint32_t clkid;
const struct pinctrl_dev_config *pincfg; const struct pinctrl_dev_config *pincfg;