diff options
| author | Hal Feng <hal.feng@starfivetech.com> | 2024-07-31 10:38:00 +0300 |
|---|---|---|
| committer | Hal Feng <hal.feng@starfivetech.com> | 2024-08-27 10:03:34 +0300 |
| commit | d1bc4f65e25e3d1c70c9f60f9280bcb26f0014f4 (patch) | |
| tree | 0486ffaf1116088c25df2c40057ff4ab880a90b8 | |
| parent | f8b44974365eaf3e1580005a43929ee2e0129863 (diff) | |
| download | u-boot-d1bc4f65e25e3d1c70c9f60f9280bcb26f0014f4.tar.xz | |
i2c: designware_i2c: Revert a part of commit "i2c:desigware-snps: add i2c clock config"
This reverts a part of
commit 83dd87455664 ("i2c:desigware-snps: add i2c clock config").
Signed-off-by: Hal Feng <hal.feng@starfivetech.com>
| -rw-r--r-- | drivers/i2c/designware_i2c.c | 14 | ||||
| -rw-r--r-- | drivers/i2c/designware_i2c.h | 1 |
2 files changed, 5 insertions, 10 deletions
diff --git a/drivers/i2c/designware_i2c.c b/drivers/i2c/designware_i2c.c index c1b3df9600..e57eed0f6c 100644 --- a/drivers/i2c/designware_i2c.c +++ b/drivers/i2c/designware_i2c.c @@ -775,14 +775,10 @@ int designware_i2c_of_to_plat(struct udevice *bus) if (ret) return ret; - ret = clk_get_bulk(bus, &priv->clks); - if (ret) - return ret; - - ret = clk_enable_bulk(&priv->clks); + ret = clk_enable(&priv->clk); if (ret && ret != -ENOSYS && ret != -ENOTSUPP) { - clk_release_bulk(&priv->clks); - dev_err(bus, "failed to enable bulk clock\n"); + clk_free(&priv->clk); + dev_err(bus, "failed to enable clock\n"); return ret; } #endif @@ -813,8 +809,8 @@ int designware_i2c_remove(struct udevice *dev) struct dw_i2c *priv = dev_get_priv(dev); #if CONFIG_IS_ENABLED(CLK) - clk_disable_bulk(&priv->clks); - clk_release_bulk(&priv->clks); + clk_disable(&priv->clk); + clk_free(&priv->clk); #endif return reset_release_bulk(&priv->resets); diff --git a/drivers/i2c/designware_i2c.h b/drivers/i2c/designware_i2c.h index d5aaef1d79..9b2349a0a2 100644 --- a/drivers/i2c/designware_i2c.h +++ b/drivers/i2c/designware_i2c.h @@ -204,7 +204,6 @@ struct dw_i2c { bool has_spk_cnt; #if CONFIG_IS_ENABLED(CLK) struct clk clk; - struct clk_bulk clks; #endif struct dw_i2c_speed_config config; }; |