Unverified Commit d4e9889b authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-5.13' of... 

Merge branch 'for-5.13' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.14
parents eb37ca9c 41daf6ba

include/sound/soc-dai.h

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ struct snd_compr_stream; 
#define SND_SOC_DAIFMT_CBP_CFP		(1 << 12) /* codec clk provider & frame provider */

#define SND_SOC_DAIFMT_CBC_CFP		(2 << 12) /* codec clk consumer & frame provider */

#define SND_SOC_DAIFMT_CBP_CFC		(3 << 12) /* codec clk provider & frame consumer */

#define SND_SOC_DAIFMT_CBC_CFC		(4 << 12) /* codec clk consumer & frame follower */

#define SND_SOC_DAIFMT_CBC_CFC		(4 << 12) /* codec clk consumer & frame consumer */



/* previous definitions kept for backwards-compatibility, do not use in new contributions */

#define SND_SOC_DAIFMT_CBM_CFM		SND_SOC_DAIFMT_CBP_CFP

sound/soc/codecs/ak5558.c

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ static struct snd_soc_dai_driver ak5558_dai = { 
};



static struct snd_soc_dai_driver ak5552_dai = {

	.name = "ak5558-aif",

	.name = "ak5552-aif",

	.capture = {

		.stream_name = "Capture",

		.channels_min = 1,

sound/soc/codecs/cs35l32.c

+3 −0
Original line number Diff line number Diff line
@@ -262,6 +262,9 @@ static const struct regmap_config cs35l32_regmap = { 
	.readable_reg = cs35l32_readable_register,

	.precious_reg = cs35l32_precious_register,

	.cache_type = REGCACHE_RBTREE,



	.use_single_read = true,

	.use_single_write = true,

};



static int cs35l32_handle_of_data(struct i2c_client *i2c_client,

sound/soc/codecs/cs35l33.c

+1 −0
Original line number Diff line number Diff line
@@ -1202,6 +1202,7 @@ static int cs35l33_i2c_probe(struct i2c_client *i2c_client, 
		dev_err(&i2c_client->dev,

			"CS35L33 Device ID (%X). Expected ID %X\n",

			devid, CS35L33_CHIP_ID);

		ret = -EINVAL;

		goto err_enable;

	}

sound/soc/codecs/cs35l34.c

+3 −0
Original line number Diff line number Diff line
@@ -801,6 +801,9 @@ static struct regmap_config cs35l34_regmap = { 
	.readable_reg = cs35l34_readable_register,

	.precious_reg = cs35l34_precious_register,

	.cache_type = REGCACHE_RBTREE,



	.use_single_read = true,

	.use_single_write = true,

};



static int cs35l34_handle_of_data(struct i2c_client *i2c_client,