Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / drivers / i2c / muxes / pca954x.c

diff --git a/drivers/i2c/muxes/pca954x.c b/drivers/i2c/muxes/pca954x.c
index 01ca1ff48db903875b116825edac2fa7c1e460e7..2b70ff82bdd09af59abbe2e894b38328dac55687 100644 (file)
--- a/drivers/i2c/muxes/pca954x.c
+++ b/drivers/i2c/muxes/pca954x.c
@@ -27,6 +27,7 @@ struct chip_desc {
                pca954x_ismux = 0,
                pca954x_isswi,
        } muxtype;
+       u32 width;
 };
 
 struct pca954x_priv {
@@ -39,14 +40,17 @@ static const struct chip_desc chips[] = {
        [PCA9544] = {
                .enable = 0x4,
                .muxtype = pca954x_ismux,
+               .width = 4,
        },
        [PCA9547] = {
                .enable = 0x8,
                .muxtype = pca954x_ismux,
+               .width = 8,
        },
        [PCA9548] = {
                .enable = 0x8,
                .muxtype = pca954x_isswi,
+               .width = 8,
        },
 };
 
@@ -89,13 +93,14 @@ static const struct udevice_id pca954x_ids[] = {
 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);
        if (!priv->addr) {
                debug("MUX not found\n");
                return -ENODEV;
        }
-       priv->width = dev_get_driver_data(dev);
+       priv->width = chip->width;
 
        if (!priv->width) {
                debug("No I2C MUX width specified\n");