Commit af5fb678 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/ak4613', 'asoc/fix/arizona',... 

Merge remote-tracking branches 'asoc/fix/ak4613', 'asoc/fix/arizona', 'asoc/fix/cx20442', 'asoc/fix/davinci', 'asoc/fix/fsl-ssi' and 'asoc/fix/hdmi' into asoc-linus
parents 9d3146c4 dcd2d1f7 19edeb30 86c0ae7c 8e1cc0e4 4f14f5c1 6de7df8d

sound/soc/codecs/Kconfig

+4 −3
Original line number Diff line number Diff line
@@ -486,6 +486,7 @@ config SND_SOC_HDMI_CODEC 
	tristate

	select SND_PCM_ELD

	select SND_PCM_IEC958

	select HDMI



config SND_SOC_ES8328

	tristate "Everest Semi ES8328 CODEC"

sound/soc/codecs/ak4613.c

+1 −1
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ static const struct regmap_config ak4613_regmap_cfg = { 
	.max_register		= 0x16,

	.reg_defaults		= ak4613_reg,

	.num_reg_defaults	= ARRAY_SIZE(ak4613_reg),

	.cache_type		= REGCACHE_RBTREE,

};



static const struct of_device_id ak4613_of_match[] = {
@@ -530,7 +531,6 @@ static int ak4613_i2c_remove(struct i2c_client *client) 
static struct i2c_driver ak4613_i2c_driver = {

	.driver = {

		.name = "ak4613-codec",

		.owner = THIS_MODULE,

		.of_match_table = ak4613_of_match,

	},

	.probe		= ak4613_i2c_probe,

sound/soc/codecs/cx20442.c

+1 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ static int v253_open(struct tty_struct *tty) 
	if (!tty->disc_data)

		return -ENODEV;



	tty->receive_room = 16;

	if (tty->ops->write(tty, v253_init, len) != len) {

		ret = -EIO;

		goto err;

sound/soc/codecs/wm5102.c

+1 −1
Original line number Diff line number Diff line
@@ -1872,7 +1872,7 @@ static struct snd_soc_dai_driver wm5102_dai[] = { 
		.capture = {

			.stream_name = "Audio Trace CPU",

			.channels_min = 1,

			.channels_max = 6,

			.channels_max = 4,

			.rates = WM5102_RATES,

			.formats = WM5102_FORMATS,

		},

sound/soc/codecs/wm5110.c

+1 −0
Original line number Diff line number Diff line
@@ -1723,6 +1723,7 @@ static const struct snd_soc_dapm_route wm5110_dapm_routes[] = { 
	{ "OUT2L", NULL, "SYSCLK" },

	{ "OUT2R", NULL, "SYSCLK" },

	{ "OUT3L", NULL, "SYSCLK" },

	{ "OUT3R", NULL, "SYSCLK" },

	{ "OUT4L", NULL, "SYSCLK" },

	{ "OUT4R", NULL, "SYSCLK" },

	{ "OUT5L", NULL, "SYSCLK" },