From: Mark Brown <broonie@kernel.org>
Date: Mon, 11 Jul 2022 14:51:01 +0000 (+0100)
Subject: ASoC: Merge up fixes
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=39c5c44fc451c083908e77c3b2762fae2bf8acca;p=linux.git

ASoC: Merge up fixes

Needed for the Rockchip driver.
---

39c5c44fc451c083908e77c3b2762fae2bf8acca
diff --cc sound/soc/rockchip/rockchip_i2s.c
index ee33c5d2e948f,c9fedf6eb2e67..f5f3540a9e186
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@@ -803,23 -808,36 +803,22 @@@ static int rockchip_i2s_probe(struct pl
  
  	i2s->bclk_ratio = 64;
  	i2s->pinctrl = devm_pinctrl_get(&pdev->dev);
- 
 -	if (IS_ERR(i2s->pinctrl)) {
 -		dev_err(&pdev->dev, "failed to find i2s pinctrl\n");
 -		ret = PTR_ERR(i2s->pinctrl);
 -		goto err_clk;
 +	if (!IS_ERR(i2s->pinctrl)) {
 +		i2s->bclk_on = pinctrl_lookup_state(i2s->pinctrl, "bclk_on");
 +		if (!IS_ERR_OR_NULL(i2s->bclk_on)) {
 +			i2s->bclk_off = pinctrl_lookup_state(i2s->pinctrl, "bclk_off");
 +			if (IS_ERR_OR_NULL(i2s->bclk_off)) {
 +				dev_err(&pdev->dev, "failed to find i2s bclk_off\n");
 +				ret = -EINVAL;
 +				goto err_clk;
 +			}
 +		}
 +	} else {
 +		dev_dbg(&pdev->dev, "failed to find i2s pinctrl\n");
  	}
  
 -	i2s->bclk_on = pinctrl_lookup_state(i2s->pinctrl,
 -				   "bclk_on");
 -	if (IS_ERR_OR_NULL(i2s->bclk_on))
 -		dev_err(&pdev->dev, "failed to find i2s default state\n");
 -	else
 -		dev_dbg(&pdev->dev, "find i2s bclk state\n");
 -
 -	i2s->bclk_off = pinctrl_lookup_state(i2s->pinctrl,
 -				  "bclk_off");
 -	if (IS_ERR_OR_NULL(i2s->bclk_off))
 -		dev_err(&pdev->dev, "failed to find i2s gpio state\n");
 -	else
 -		dev_dbg(&pdev->dev, "find i2s bclk_off state\n");
 -
  	i2s_pinctrl_select_bclk_off(i2s);
  
 -	i2s->playback_dma_data.addr = res->start + I2S_TXDR;
 -	i2s->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
 -	i2s->playback_dma_data.maxburst = 4;
 -
 -	i2s->capture_dma_data.addr = res->start + I2S_RXDR;
 -	i2s->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
 -	i2s->capture_dma_data.maxburst = 4;
 -
  	dev_set_drvdata(&pdev->dev, i2s);
  
  	pm_runtime_enable(&pdev->dev);