i2c: fsl_i2c: Make live-tree compatible
authorMario Six <mario.six@gdsys.cc>
Mon, 15 Jan 2018 10:08:09 +0000 (11:08 +0100)
committerHeiko Schocher <hs@denx.de>
Tue, 6 Feb 2018 05:59:59 +0000 (06:59 +0100)
Make the fsl_i2c driver compatible with a live device tree.

Reviewed-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Mario Six <mario.six@gdsys.cc>
drivers/i2c/fsl_i2c.c

index a7f3ec472fb8b60786addfdc68b86a1eddc5376e..cb0f5ea2333fbe9bb0f6c402fa0a76597ec7162c 100644 (file)
@@ -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;