[U-Boot] [RESEND PATCH v2 3/6] i2c: fsl_i2c: Make live-tree compatible

Mario Six mario.six at gdsys.cc
Mon Jan 15 10:08:09 UTC 2018


Make the fsl_i2c driver compatible with a live device tree.

Reviewed-by: Heiko Schocher <hs at denx.de>
Signed-off-by: Mario Six <mario.six at gdsys.cc>
---

v1 -> v2:
None

---
 drivers/i2c/fsl_i2c.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c
index a7f3ec472f..cb0f5ea233 100644
--- a/drivers/i2c/fsl_i2c.c
+++ b/drivers/i2c/fsl_i2c.c
@@ -574,22 +574,18 @@ static int fsl_i2c_ofdata_to_platdata(struct udevice *bus)
 {
 	struct fsl_i2c_dev *dev = dev_get_priv(bus);
 	fdt_addr_t addr;
-	fdt_size_t size;
-	int node = dev_of_offset(bus);

-	addr = fdtdec_get_addr_size_auto_noparent(gd->fdt_blob, node, "reg", 0,
-						  &size, false);
+	addr = dev_read_u32_default(bus, "reg", -1);

-	dev->base = map_sysmem(CONFIG_SYS_IMMR + addr, size);
+	dev->base = map_sysmem(CONFIG_SYS_IMMR + addr, sizeof(struct fsl_i2c_base));

 	if (!dev->base)
 		return -ENOMEM;

-	dev->index = fdtdec_get_int(gd->fdt_blob, node, "cell-index", -1);
-	dev->slaveadd = fdtdec_get_int(gd->fdt_blob, node,
-				       "u-boot,i2c-slave-addr", 0x7f);
-	dev->speed = fdtdec_get_int(gd->fdt_blob, node, "clock-frequency",
-				    400000);
+	dev->index = dev_read_u32_default(bus, "cell-index", -1);
+	dev->slaveadd = dev_read_u32_default(bus, "u-boot,i2c-slave-addr",
+					     0x7f);
+	dev->speed = dev_read_u32_default(bus, "clock-frequency", 400000);

 	dev->i2c_clk = dev->index ? gd->arch.i2c2_clk : gd->arch.i2c1_clk;

--
2.11.0



More information about the U-Boot mailing list