Skip to content

Commit 3256412

Browse files
Weilong Chenwsakernel
authored andcommitted
i2c: hisi: Add support to get clock frequency from clock
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 <[email protected]> Acked-by: Yicong Yang <[email protected]> Signed-off-by: Wolfram Sang <[email protected]>
1 parent d78a167 commit 3256412

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

drivers/i2c/busses/i2c-hisi.c

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
#include <linux/bits.h>
99
#include <linux/bitfield.h>
10+
#include <linux/clk.h>
1011
#include <linux/completion.h>
1112
#include <linux/i2c.h>
1213
#include <linux/interrupt.h>
@@ -88,6 +89,7 @@ struct hisi_i2c_controller {
8889
struct i2c_adapter adapter;
8990
void __iomem *iobase;
9091
struct device *dev;
92+
struct clk *clk;
9193
int irq;
9294

9395
/* Intermediates for recording the transfer process */
@@ -454,10 +456,15 @@ static int hisi_i2c_probe(struct platform_device *pdev)
454456
return ret;
455457
}
456458

457-
ret = device_property_read_u64(dev, "clk_rate", &clk_rate_hz);
458-
if (ret) {
459-
dev_err(dev, "failed to get clock frequency, ret = %d\n", ret);
460-
return ret;
459+
ctlr->clk = devm_clk_get_optional_enabled(&pdev->dev, NULL);
460+
if (IS_ERR_OR_NULL(ctlr->clk)) {
461+
ret = device_property_read_u64(dev, "clk_rate", &clk_rate_hz);
462+
if (ret) {
463+
dev_err(dev, "failed to get clock frequency, ret = %d\n", ret);
464+
return ret;
465+
}
466+
} else {
467+
clk_rate_hz = clk_get_rate(ctlr->clk);
461468
}
462469

463470
ctlr->clk_rate_khz = DIV_ROUND_UP_ULL(clk_rate_hz, HZ_PER_KHZ);

0 commit comments

Comments
 (0)