Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-28 08:35:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

i2c: designware_i2c: Drop scl_sda_cfg parameter

Browse source 
Instead of passing this parameter into __dw_i2c_set_bus_speed(), pass in
the driver's private data, from which the function can obtain that
information. This allows the function to have access to the full state of
the driver.

Signed-off-by: Sicomp_param1mon Glass <sjg@chromium.org>
Reviewed-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2020-01-23 11:48:12 -07:00 • committed by Heiko Schocher
parent 80a03db4f3
commit d22409e2dc
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/i2c/designware_i2c.c
View file

@ -52,17 +52,20 @@ static int dw_i2c_enable(struct i2c_regs *i2c_base, bool enable)
* *
* Set the i2c speed. * Set the i2c speed.
*/ */
static unsigned int __dw_i2c_set_bus_speed(struct i2c_regs *i2c_base, static unsigned int __dw_i2c_set_bus_speed(struct dw_i2c *priv,
struct dw_scl_sda_cfg *scl_sda_cfg, struct i2c_regs *i2c_base,
unsigned int speed, unsigned int speed,
unsigned int bus_clk) unsigned int bus_clk)
{ {
const struct dw_scl_sda_cfg *scl_sda_cfg = NULL;
ulong bus_khz = bus_clk / 1000; ulong bus_khz = bus_clk / 1000;
enum i2c_speed_mode i2c_spd; enum i2c_speed_mode i2c_spd;
unsigned int cntl; unsigned int cntl;
unsigned int hcnt, lcnt; unsigned int hcnt, lcnt;
unsigned int ena; unsigned int ena;
if (priv)
scl_sda_cfg = priv->scl_sda_cfg;
/* Allow high speed if there is no config, or the config allows it */ /* Allow high speed if there is no config, or the config allows it */
if (speed >= I2C_HIGH_SPEED && if (speed >= I2C_HIGH_SPEED &&
(!scl_sda_cfg || scl_sda_cfg->has_high_speed)) (!scl_sda_cfg || scl_sda_cfg->has_high_speed))
@ -371,7 +374,7 @@ static int __dw_i2c_init(struct i2c_regs *i2c_base, int speed, int slaveaddr)
writel(IC_TX_TL, &i2c_base->ic_tx_tl); writel(IC_TX_TL, &i2c_base->ic_tx_tl);
writel(IC_STOP_DET, &i2c_base->ic_intr_mask); writel(IC_STOP_DET, &i2c_base->ic_intr_mask);
#ifndef CONFIG_DM_I2C #ifndef CONFIG_DM_I2C
__dw_i2c_set_bus_speed(i2c_base, NULL, speed, IC_CLK); __dw_i2c_set_bus_speed(NULL, i2c_base, speed, IC_CLK);
writel(slaveaddr, &i2c_base->ic_sar); writel(slaveaddr, &i2c_base->ic_sar);
#endif #endif
@ -416,7 +419,7 @@ static unsigned int dw_i2c_set_bus_speed(struct i2c_adapter *adap,
unsigned int speed) unsigned int speed)
{ {
adap->speed = speed; adap->speed = speed;
return __dw_i2c_set_bus_speed(i2c_get_base(adap), NULL, speed, IC_CLK); return __dw_i2c_set_bus_speed(NULL, i2c_get_base(adap), speed, IC_CLK);
} }
static void dw_i2c_init(struct i2c_adapter *adap, int speed, int slaveaddr) static void dw_i2c_init(struct i2c_adapter *adap, int speed, int slaveaddr)
@ -515,8 +518,7 @@ static int designware_i2c_set_bus_speed(struct udevice *bus, unsigned int speed)
#else #else
rate = IC_CLK; rate = IC_CLK;
#endif #endif
return __dw_i2c_set_bus_speed(i2c->regs, i2c->scl_sda_cfg, speed, return __dw_i2c_set_bus_speed(i2c, i2c->regs, speed, rate);
rate);
} }
static int designware_i2c_probe_chip(struct udevice *bus, uint chip_addr, static int designware_i2c_probe_chip(struct udevice *bus, uint chip_addr,