ASoC: Merge up fixes

Needed for the Rockchip driver.

diff --cc sound/soc/codecs/cs47l92.c
Simple merge

diff --cc sound/soc/codecs/rt5640.c
Simple merge

diff --cc sound/soc/codecs/tas2764.c
Simple merge

diff --cc sound/soc/codecs/tlv320adcx140.c
Simple merge

diff --cc sound/soc/codecs/wcd9335.c
Simple merge

diff --cc sound/soc/codecs/wm5102.c
Simple merge

diff --cc sound/soc/codecs/wm8998.c
Simple merge

diff --cc sound/soc/intel/boards/sof_rt5682.c
Simple merge

diff --cc sound/soc/rockchip/rockchip_i2s.c
index ee33c5d2e948f0391a03de83e462ed9c345a97b6,c9fedf6eb2e67c446c656eeca35730a8f0b5b856..f5f3540a9e18613e78522a0480ea6e496ccb3d44
--- 1/sound/soc/rockchip/rockchip_i2s.c
--- 2/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);

diff --cc sound/soc/ti/omap-mcbsp.c
Simple merge