Commit ddd5609f authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v5.7' of... 

Merge tag 'asoc-fix-v5.7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v5.7

A collection of fixes that have been accumilated since the merge window,
mainly relating to x86 platform support.
parents 3c6fd1f0 ccfc5316

Documentation/devicetree/bindings/sound/cirrus,cs42l51.yaml

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ required: 
examples:

  - |

    #include <dt-bindings/gpio/gpio.h>

    i2c@0 {

    i2c {

      #address-cells = <1>;

      #size-cells = <0>;

include/sound/soc-dai.h

+1 −1
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ struct snd_soc_dai { 


	/* bit field */

	unsigned int probed:1;

	unsigned int started:1;

	unsigned int started[SNDRV_PCM_STREAM_LAST + 1];

};



static inline struct snd_soc_pcm_stream *

sound/soc/amd/raven/acp3x-i2s.c

+1 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ static int acp3x_i2s_hwparams(struct snd_pcm_substream *substream, 
		rv_writel(adata->tdm_fmt, rtd->acp3x_base + frmt_reg);

	}

	val = rv_readl(rtd->acp3x_base + reg_val);

	val &= ~ACP3x_ITER_IRER_SAMP_LEN_MASK;

	val = val | (rtd->xfer_resolution  << 3);

	rv_writel(val, rtd->acp3x_base + reg_val);

	return 0;

sound/soc/amd/raven/acp3x.h

+2 −0
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ 
#define ACP_POWERED_OFF			0x02

#define ACP_POWER_OFF_IN_PROGRESS	0x03



#define ACP3x_ITER_IRER_SAMP_LEN_MASK	0x38



struct acp3x_platform_info {

	u16 play_i2s_instance;

	u16 cap_i2s_instance;

sound/soc/bcm/bcm63xx-pcm-whistler.c

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ bcm63xx_pcm_pointer(struct snd_soc_component *component, 
	snd_pcm_uframes_t x;

	struct bcm63xx_runtime_data *prtd = substream->runtime->private_data;



	if ((void *)prtd->dma_addr_next == NULL)

	if (!prtd->dma_addr_next)

		prtd->dma_addr_next = substream->runtime->dma_addr;



	x = bytes_to_frames(substream->runtime,

CRA Git | Maintained and supported by SUSTech CRA and CCSE