Skip to content

Commit

Permalink
i2c: mux: demux-pinctrl: run properly with multiple instances
Browse files Browse the repository at this point in the history
We can't use a static property for all the changesets, so we now create
dynamic ones for each changeset.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Fixes: 50a5ba8 ("i2c: mux: demux-pinctrl: add driver")
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
  • Loading branch information
Wolfram Sang authored and Wolfram Sang committed Sep 8, 2016
1 parent b31cc4b commit e35478e
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions drivers/i2c/muxes/i2c-demux-pinctrl.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ struct i2c_demux_pinctrl_priv {
struct i2c_demux_pinctrl_chan chan[];
};

static struct property status_okay = { .name = "status", .length = 3, .value = "ok" };

static int i2c_demux_master_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
{
struct i2c_demux_pinctrl_priv *priv = adap->algo_data;
Expand Down Expand Up @@ -193,6 +191,7 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
struct i2c_demux_pinctrl_priv *priv;
struct property *props;
int num_chan, i, j, err;

num_chan = of_count_phandle_with_args(np, "i2c-parent", NULL);
Expand All @@ -203,7 +202,10 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev)

priv = devm_kzalloc(&pdev->dev, sizeof(*priv)
+ num_chan * sizeof(struct i2c_demux_pinctrl_chan), GFP_KERNEL);
if (!priv)

props = devm_kcalloc(&pdev->dev, num_chan, sizeof(*props), GFP_KERNEL);

if (!priv || !props)
return -ENOMEM;

err = of_property_read_string(np, "i2c-bus-name", &priv->bus_name);
Expand All @@ -221,8 +223,12 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev)
}
priv->chan[i].parent_np = adap_np;

props[i].name = devm_kstrdup(&pdev->dev, "status", GFP_KERNEL);
props[i].value = devm_kstrdup(&pdev->dev, "ok", GFP_KERNEL);
props[i].length = 3;

of_changeset_init(&priv->chan[i].chgset);
of_changeset_update_property(&priv->chan[i].chgset, adap_np, &status_okay);
of_changeset_update_property(&priv->chan[i].chgset, adap_np, &props[i]);
}

priv->num_chan = num_chan;
Expand Down

0 comments on commit e35478e

Please sign in to comment.