| Message ID | 1452727540-3249-20-git-send-email-sjg@chromium.org |
|---|---|
| State | Superseded |
| Delegated to: | Simon Glass |
| Headers | show |
Hello Simon, Am 14.01.2016 um 00:25 schrieb Simon Glass: > We can use the new clk_get_by_index() function to get the correct clock. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > drivers/i2c/rk_i2c.c | 37 +++++++++++++++++++++---------------- > 1 file changed, 21 insertions(+), 16 deletions(-) Thanks! Acked-by: Heiko Schocher <hs@denx.de> bye, Heiko > > diff --git a/drivers/i2c/rk_i2c.c b/drivers/i2c/rk_i2c.c > index ebdba35..4030330 100644 > --- a/drivers/i2c/rk_i2c.c > +++ b/drivers/i2c/rk_i2c.c > @@ -30,10 +30,9 @@ DECLARE_GLOBAL_DATA_PTR; > > struct rk_i2c { > struct udevice *clk; > - struct udevice *pinctrl; > struct i2c_regs *regs; > unsigned int speed; > - enum periph_id id; > + int clk_id; > }; > > static inline void rk_i2c_get_div(int div, int *divh, int *divl) > @@ -56,7 +55,7 @@ static void rk_i2c_set_clk(struct rk_i2c *i2c, uint32_t scl_rate) > int div, divl, divh; > > /* First get i2c rate from pclk */ > - i2c_rate = clk_get_periph_rate(i2c->clk, i2c->id); > + i2c_rate = clk_get_periph_rate(i2c->clk, i2c->clk_id); > > div = DIV_ROUND_UP(i2c_rate, scl_rate * 8) - 2; > divh = 0; > @@ -352,23 +351,28 @@ int rockchip_i2c_set_bus_speed(struct udevice *bus, unsigned int speed) > return 0; > } > > -static int rockchip_i2c_probe(struct udevice *bus) > +static int rockchip_i2c_ofdata_to_platdata(struct udevice *bus) > { > - struct rk_i2c *i2c = dev_get_priv(bus); > + struct rk_i2c *priv = dev_get_priv(bus); > int ret; > > - ret = uclass_get_device(UCLASS_PINCTRL, 0, &i2c->pinctrl); > - if (ret) > - return ret; > - ret = uclass_get_device(UCLASS_CLK, 0, &i2c->clk); > - if (ret) > - return ret; > - ret = pinctrl_get_periph_id(i2c->pinctrl, bus); > - if (ret < 0) > + ret = clk_get_by_index(bus, 0, &priv->clk, &priv->clk_id); > + if (ret < 0) { > + debug("%s: Could not get clock for %s: %d\n", __func__, > + bus->name, ret); > return ret; > - i2c->id = ret; > - i2c->regs = (void *)dev_get_addr(bus); > - return pinctrl_request(i2c->pinctrl, i2c->id, 0); > + } > + > + return 0; > +} > + > +static int rockchip_i2c_probe(struct udevice *bus) > +{ > + struct rk_i2c *priv = dev_get_priv(bus); > + > + priv->regs = (void *)dev_get_addr(bus); > + > + return 0; > } > > static const struct dm_i2c_ops rockchip_i2c_ops = { > @@ -385,6 +389,7 @@ U_BOOT_DRIVER(i2c_rockchip) = { > .name = "i2c_rockchip", > .id = UCLASS_I2C, > .of_match = rockchip_i2c_ids, > + .ofdata_to_platdata = rockchip_i2c_ofdata_to_platdata, > .probe = rockchip_i2c_probe, > .priv_auto_alloc_size = sizeof(struct rk_i2c), > .ops = &rockchip_i2c_ops, >
diff --git a/drivers/i2c/rk_i2c.c b/drivers/i2c/rk_i2c.c index ebdba35..4030330 100644 --- a/drivers/i2c/rk_i2c.c +++ b/drivers/i2c/rk_i2c.c @@ -30,10 +30,9 @@ DECLARE_GLOBAL_DATA_PTR; struct rk_i2c { struct udevice *clk; - struct udevice *pinctrl; struct i2c_regs *regs; unsigned int speed; - enum periph_id id; + int clk_id; }; static inline void rk_i2c_get_div(int div, int *divh, int *divl) @@ -56,7 +55,7 @@ static void rk_i2c_set_clk(struct rk_i2c *i2c, uint32_t scl_rate) int div, divl, divh; /* First get i2c rate from pclk */ - i2c_rate = clk_get_periph_rate(i2c->clk, i2c->id); + i2c_rate = clk_get_periph_rate(i2c->clk, i2c->clk_id); div = DIV_ROUND_UP(i2c_rate, scl_rate * 8) - 2; divh = 0; @@ -352,23 +351,28 @@ int rockchip_i2c_set_bus_speed(struct udevice *bus, unsigned int speed) return 0; } -static int rockchip_i2c_probe(struct udevice *bus) +static int rockchip_i2c_ofdata_to_platdata(struct udevice *bus) { - struct rk_i2c *i2c = dev_get_priv(bus); + struct rk_i2c *priv = dev_get_priv(bus); int ret; - ret = uclass_get_device(UCLASS_PINCTRL, 0, &i2c->pinctrl); - if (ret) - return ret; - ret = uclass_get_device(UCLASS_CLK, 0, &i2c->clk); - if (ret) - return ret; - ret = pinctrl_get_periph_id(i2c->pinctrl, bus); - if (ret < 0) + ret = clk_get_by_index(bus, 0, &priv->clk, &priv->clk_id); + if (ret < 0) { + debug("%s: Could not get clock for %s: %d\n", __func__, + bus->name, ret); return ret; - i2c->id = ret; - i2c->regs = (void *)dev_get_addr(bus); - return pinctrl_request(i2c->pinctrl, i2c->id, 0); + } + + return 0; +} + +static int rockchip_i2c_probe(struct udevice *bus) +{ + struct rk_i2c *priv = dev_get_priv(bus); + + priv->regs = (void *)dev_get_addr(bus); + + return 0; } static const struct dm_i2c_ops rockchip_i2c_ops = { @@ -385,6 +389,7 @@ U_BOOT_DRIVER(i2c_rockchip) = { .name = "i2c_rockchip", .id = UCLASS_I2C, .of_match = rockchip_i2c_ids, + .ofdata_to_platdata = rockchip_i2c_ofdata_to_platdata, .probe = rockchip_i2c_probe, .priv_auto_alloc_size = sizeof(struct rk_i2c), .ops = &rockchip_i2c_ops,
We can use the new clk_get_by_index() function to get the correct clock. Signed-off-by: Simon Glass <sjg@chromium.org> --- drivers/i2c/rk_i2c.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-)