Unverified Commit f99986c0 authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Mark Brown
Browse files

ASoC: codecs: wcd938x: setup irq during component bind 



SoundWire registers are only accessable after sdw components are succesfully
binded. Setup irqs at that point instead of doing at probe.

Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20210716105735.6073-1-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 9a3223b0

sound/soc/codecs/wcd938x.c

+9 −9
Original line number Diff line number Diff line
@@ -3317,13 +3317,6 @@ static int wcd938x_soc_codec_probe(struct snd_soc_component *component) 
			     (WCD938X_DIGITAL_INTR_LEVEL_0 + i), 0);

	}



	ret = wcd938x_irq_init(wcd938x, component->dev);

	if (ret) {

		dev_err(component->dev, "%s: IRQ init failed: %d\n",

			__func__, ret);

		return ret;

	}



	wcd938x->hphr_pdm_wd_int = regmap_irq_get_virq(wcd938x->irq_chip,

						       WCD938X_IRQ_HPHR_PDM_WD_INT);

	wcd938x->hphl_pdm_wd_int = regmap_irq_get_virq(wcd938x->irq_chip,
@@ -3553,7 +3546,6 @@ static int wcd938x_bind(struct device *dev) 
	}

	wcd938x->sdw_priv[AIF1_PB] = dev_get_drvdata(wcd938x->rxdev);

	wcd938x->sdw_priv[AIF1_PB]->wcd938x = wcd938x;

	wcd938x->sdw_priv[AIF1_PB]->slave_irq = wcd938x->virq;



	wcd938x->txdev = wcd938x_sdw_device_get(wcd938x->txnode);

	if (!wcd938x->txdev) {
@@ -3562,7 +3554,6 @@ static int wcd938x_bind(struct device *dev) 
	}

	wcd938x->sdw_priv[AIF1_CAP] = dev_get_drvdata(wcd938x->txdev);

	wcd938x->sdw_priv[AIF1_CAP]->wcd938x = wcd938x;

	wcd938x->sdw_priv[AIF1_CAP]->slave_irq = wcd938x->virq;

	wcd938x->tx_sdw_dev = dev_to_sdw_dev(wcd938x->txdev);

	if (!wcd938x->tx_sdw_dev) {

		dev_err(dev, "could not get txslave with matching of dev\n");
@@ -3595,6 +3586,15 @@ static int wcd938x_bind(struct device *dev) 
		return PTR_ERR(wcd938x->regmap);

	}



	ret = wcd938x_irq_init(wcd938x, dev);

	if (ret) {

		dev_err(dev, "%s: IRQ init failed: %d\n", __func__, ret);

		return ret;

	}



	wcd938x->sdw_priv[AIF1_PB]->slave_irq = wcd938x->virq;

	wcd938x->sdw_priv[AIF1_CAP]->slave_irq = wcd938x->virq;



	ret = wcd938x_set_micbias_data(wcd938x);

	if (ret < 0) {

		dev_err(dev, "%s: bad micbias pdata\n", __func__);