Unverified Commit 1a32b4b9 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Merge fixes due to dependencies 

So we can apply the tlv320aic3xxx DT conversion.
parents 928314eb f9fd804a

Documentation/devicetree/bindings/sound/tlv320aic32x4.txt

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Required properties: 
	"ti,tlv320aic32x6" TLV320AIC3206, TLV320AIC3256

	"ti,tas2505" TAS2505, TAS2521

 - reg: I2C slave address

 - supply-*: Required supply regulators are:

 - *-supply: Required supply regulators are:

    "iov" - digital IO power supply

    "ldoin" - LDO power supply

    "dv" - Digital core power supply

drivers/firmware/cirrus/cs_dsp.c

+3 −2
Original line number Diff line number Diff line
@@ -2124,6 +2124,7 @@ static int cs_dsp_load_coeff(struct cs_dsp *dsp, const struct firmware *firmware 
				   file, blocks, le32_to_cpu(blk->len),

				   type, le32_to_cpu(blk->id));



			region_name = cs_dsp_mem_region_name(type);

			mem = cs_dsp_find_region(dsp, type);

			if (!mem) {

				cs_dsp_err(dsp, "No base for region %x\n", type);
@@ -2147,8 +2148,8 @@ static int cs_dsp_load_coeff(struct cs_dsp *dsp, const struct firmware *firmware 
				reg = dsp->ops->region_to_reg(mem, reg);

				reg += offset;

			} else {

				cs_dsp_err(dsp, "No %x for algorithm %x\n",

					   type, le32_to_cpu(blk->id));

				cs_dsp_err(dsp, "No %s for algorithm %x\n",

					   region_name, le32_to_cpu(blk->id));

			}

			break;

include/sound/soc-acpi.h

+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ struct snd_soc_acpi_link_adr { 
/* Descriptor for SST ASoC machine driver */

struct snd_soc_acpi_mach {

	u8 id[ACPI_ID_LEN];

	const char *uid;

	const struct snd_soc_acpi_codecs *comp_ids;

	const u32 link_mask;

	const struct snd_soc_acpi_link_adr *links;

include/sound/soc-dpcm.h

+4 −0
Original line number Diff line number Diff line
@@ -122,6 +122,10 @@ int snd_soc_dpcm_can_be_free_stop(struct snd_soc_pcm_runtime *fe, 
int snd_soc_dpcm_can_be_params(struct snd_soc_pcm_runtime *fe,

		struct snd_soc_pcm_runtime *be, int stream);



/* can this BE perform prepare */

int snd_soc_dpcm_can_be_prepared(struct snd_soc_pcm_runtime *fe,

				 struct snd_soc_pcm_runtime *be, int stream);



/* is the current PCM operation for this FE ? */

int snd_soc_dpcm_fe_can_update(struct snd_soc_pcm_runtime *fe, int stream);

include/uapi/sound/skl-tplg-interface.h

+2 −1
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ enum skl_ch_cfg { 
	SKL_CH_CFG_DUAL_MONO = 9,

	SKL_CH_CFG_I2S_DUAL_STEREO_0 = 10,

	SKL_CH_CFG_I2S_DUAL_STEREO_1 = 11,

	SKL_CH_CFG_4_CHANNEL = 12,

	SKL_CH_CFG_7_1 = 12,

	SKL_CH_CFG_4_CHANNEL = SKL_CH_CFG_7_1,

	SKL_CH_CFG_INVALID

};