From 58dc4a99b7f55fa906f1f797c51fb63daccf8a6d Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 9 Jan 2019 11:58:24 +0100 Subject: [PATCH] i2c: mux: Covert to livetree functions Updates i2c muxes drivers to support livetree. Similar changes were done by: "net: zynq_gem: convert to use livetree" (sha1: 26026e695afa794ac018a09e79a48120d322b60d) Signed-off-by: Michal Simek --- drivers/i2c/muxes/i2c-mux-uclass.c | 4 +--- drivers/i2c/muxes/pca954x.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/muxes/i2c-mux-uclass.c b/drivers/i2c/muxes/i2c-mux-uclass.c index 10336919ad..a680ee1762 100644 --- a/drivers/i2c/muxes/i2c-mux-uclass.c +++ b/drivers/i2c/muxes/i2c-mux-uclass.c @@ -11,8 +11,6 @@ #include #include -DECLARE_GLOBAL_DATA_PTR; - /** * struct i2c_mux: Information the uclass stores about an I2C mux * @@ -39,7 +37,7 @@ static int i2c_mux_child_post_bind(struct udevice *dev) struct i2c_mux_bus *plat = dev_get_parent_platdata(dev); int channel; - channel = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), "reg", -1); + channel = dev_read_u32_default(dev, "reg", -1); if (channel < 0) return -EINVAL; plat->channel = channel; diff --git a/drivers/i2c/muxes/pca954x.c b/drivers/i2c/muxes/pca954x.c index ab8b4000af..bd4e9abe5f 100644 --- a/drivers/i2c/muxes/pca954x.c +++ b/drivers/i2c/muxes/pca954x.c @@ -101,7 +101,7 @@ static int pca954x_ofdata_to_platdata(struct udevice *dev) struct pca954x_priv *priv = dev_get_priv(dev); const struct chip_desc *chip = &chips[dev_get_driver_data(dev)]; - priv->addr = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), "reg", 0); + priv->addr = dev_read_u32_default(dev, "reg", 0); if (!priv->addr) { debug("MUX not found\n"); return -ENODEV;