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

Commit 2b85d8e0 authored by Laxminath Kasam's avatar Laxminath Kasam
Browse files

asoc: wsa881x-analog: Defer wsa probe until mclk node available 



Update wsa analog driver to defer probe until mclk node
is available.

Change-Id: I8c1e9dc8fe014ebd9845cf8e9fc759106bd3ffff
Signed-off-by: default avatarLaxminath Kasam <lkasam@codeaurora.org>
parent 731807e0

asoc/codecs/wsa881x-analog.c

+11 −11
Original line number Diff line number Diff line
@@ -1340,7 +1340,7 @@ static int wsa881x_i2c_probe(struct i2c_client *client, 
		client->addr == WSA881X_I2C_SPK1_SLAVE1_ADDR) &&

		(pdata->status == WSA881X_STATUS_PROBING)) {

		wsa881x_probing_count++;

		return ret;

		return -EPROBE_DEFER;

	}



	if (pdata->status == WSA881X_STATUS_I2C) {
@@ -1396,6 +1396,15 @@ static int wsa881x_i2c_probe(struct i2c_client *client, 
			ret = -EINVAL;

			goto err;

		}

		wsa_mclk = devm_clk_get(&client->dev, "wsa_mclk");

		if (IS_ERR(wsa_mclk)) {

			ret = PTR_ERR(wsa_mclk);

			dev_dbg(&client->dev, "%s: clk get %s failed %d\n",

				__func__, "wsa_mclk", ret);

			wsa_mclk = NULL;

			goto err;

		}

		pdata->wsa_mclk = wsa_mclk;

		dev_set_drvdata(&client->dev, client);



		pdata->regmap[WSA881X_DIGITAL_SLAVE] =
@@ -1410,15 +1419,6 @@ static int wsa881x_i2c_probe(struct i2c_client *client, 
				__func__, ret);

			goto err;

		}

		wsa_mclk = devm_clk_get(&client->dev, "wsa_mclk");

		if (IS_ERR(wsa_mclk)) {

			ret = PTR_ERR(wsa_mclk);

			dev_dbg(&client->dev, "%s: clk get %s failed %d\n",

				__func__, "wsa_mclk", ret);

			wsa_mclk = NULL;

			ret = 0;

		}

		pdata->wsa_mclk = wsa_mclk;



		/* bus reset sequence */

		ret = wsa881x_reset(pdata, true);
@@ -1459,7 +1459,7 @@ static int wsa881x_i2c_probe(struct i2c_client *client, 
err1:

	wsa881x_reset(pdata, false);

err:

	return 0;

	return ret;

}



static int wsa881x_i2c_remove(struct i2c_client *client)