Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e35478ea authored by Wolfram Sang's avatar Wolfram Sang Committed by Wolfram Sang
Browse files

i2c: mux: demux-pinctrl: run properly with multiple instances 



We can't use a static property for all the changesets, so we now create
dynamic ones for each changeset.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Fixes: 50a5ba87 ("i2c: mux: demux-pinctrl: add driver")
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent b31cc4b3

drivers/i2c/muxes/i2c-demux-pinctrl.c

+10 −4
Original line number Diff line number Diff line
@@ -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;
@@ -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);
@@ -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);
@@ -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;