diff mbox series

[next,v4] i2c: hisi: Add support to get clock frequency from clock property

Message ID 20220929071547.135913-1-chenweilong@huawei.com
State Superseded
Headers show
Series [next,v4] i2c: hisi: Add support to get clock frequency from clock property | expand

Commit Message

Weilong Chen Sept. 29, 2022, 7:15 a.m. UTC 
The clk_rate attribute is not generic device tree bindings for I2C
busses described in Documentation/devicetree/bindings/i2c/i2c.txt.
It can be managed by clock binding.

Support the driver to obtain clock information by clk_rate or
clock property. Find clock first, if not, fall back to clk_rate.

Signed-off-by: Weilong Chen <chenweilong@huawei.com>
Acked-by: Yicong Yang <yangyicong@hisilicon.com>
---
Change since v1:
- Ordered struct field to inverted triangle.
- Use devm_clk_get_optional_enabled().
- Use IS_ERR_OR_NULL.
Link: https://lore.kernel.org/lkml/20220921101540.352553-1-chenweilong@huawei.com/

Change since v2:
- Remove redundant blank line
Link: https://lore.kernel.org/all/20220923011417.78994-1-chenweilong@huawei.com/

Change since v3:
- Commit message update
Link: https://lore.kernel.org/lkml/20220926091503.199474-1-chenweilong@huawei.com/T/

 drivers/i2c/busses/i2c-hisi.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

Comments

Wolfram Sang Oct. 5, 2022, 7:09 p.m. UTC | #1 
On Thu, Sep 29, 2022 at 03:15:47PM +0800, Weilong Chen wrote:
> The clk_rate attribute is not generic device tree bindings for I2C
> busses described in Documentation/devicetree/bindings/i2c/i2c.txt.
> It can be managed by clock binding.
> 
> Support the driver to obtain clock information by clk_rate or
> clock property. Find clock first, if not, fall back to clk_rate.
> 
> Signed-off-by: Weilong Chen <chenweilong@huawei.com>
> Acked-by: Yicong Yang <yangyicong@hisilicon.com>

Applied to for-current, thanks!
Wolfram Sang Oct. 5, 2022, 7:12 p.m. UTC | #2 
On Wed, Oct 05, 2022 at 09:09:52PM +0200, Wolfram Sang wrote:
> On Thu, Sep 29, 2022 at 03:15:47PM +0800, Weilong Chen wrote:
> > The clk_rate attribute is not generic device tree bindings for I2C
> > busses described in Documentation/devicetree/bindings/i2c/i2c.txt.
> > It can be managed by clock binding.
> > 
> > Support the driver to obtain clock information by clk_rate or
> > clock property. Find clock first, if not, fall back to clk_rate.
> > 
> > Signed-off-by: Weilong Chen <chenweilong@huawei.com>
> > Acked-by: Yicong Yang <yangyicong@hisilicon.com>
> 
> Applied to for-current, thanks!

Ah, sorry, wrong branch. Not applied because the dependency "i2c: hisi:
Add initial device tree support" is not applied yet (needs changes)
diff mbox series

Patch

diff --git a/drivers/i2c/busses/i2c-hisi.c b/drivers/i2c/busses/i2c-hisi.c
index 67031024217c..e4b0ebe54f6f 100644
--- a/drivers/i2c/busses/i2c-hisi.c
+++ b/drivers/i2c/busses/i2c-hisi.c
@@ -8,6 +8,7 @@ 
 #include <linux/acpi.h>
 #include <linux/bits.h>
 #include <linux/bitfield.h>
+#include <linux/clk.h>
 #include <linux/completion.h>
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
@@ -90,6 +91,7 @@  struct hisi_i2c_controller {
 	struct i2c_adapter adapter;
 	void __iomem *iobase;
 	struct device *dev;
+	struct clk *clk;
 	int irq;
 
 	/* Intermediates for recording the transfer process */
@@ -456,10 +458,15 @@  static int hisi_i2c_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	ret = device_property_read_u64(dev, "clk_rate", &clk_rate_hz);
-	if (ret) {
-		dev_err(dev, "failed to get clock frequency, ret = %d\n", ret);
-		return ret;
+	ctlr->clk = devm_clk_get_optional_enabled(&pdev->dev, NULL);
+	if (IS_ERR_OR_NULL(ctlr->clk)) {
+		ret = device_property_read_u64(dev, "clk_rate", &clk_rate_hz);
+		if (ret) {
+			dev_err(dev, "failed to get clock frequency, ret = %d\n", ret);
+			return ret;
+		}
+	} else {
+		clk_rate_hz = clk_get_rate(ctlr->clk);
 	}
 
 	ctlr->clk_rate_khz = DIV_ROUND_UP_ULL(clk_rate_hz, HZ_PER_KHZ);