Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 072cb68a authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'asoc-5.1' into asoc-5.2

parents 252163a6 86a7b6ff

sound/soc/codecs/cs4270.c

+1 −0
Original line number Diff line number Diff line
@@ -642,6 +642,7 @@ static const struct regmap_config cs4270_regmap = { 
	.reg_defaults =		cs4270_reg_defaults,

	.num_reg_defaults =	ARRAY_SIZE(cs4270_reg_defaults),

	.cache_type =		REGCACHE_RBTREE,

	.write_flag_mask =	CS4270_I2C_INCR,



	.readable_reg =		cs4270_reg_is_readable,

	.volatile_reg =		cs4270_reg_is_volatile,

sound/soc/codecs/tlv320aic32x4-i2c.c

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 *

 * Copyright 2011-2019 NW Digital Radio

 *

 * Author: Jeremy McDermond <nh6z@nh6z.net>

 * Author: Annaliese McDermond <nh6z@nh6z.net>

 *

 * Based on sound/soc/codecs/wm8974 and TI driver for kernel 2.6.27.

 *
@@ -62,5 +62,5 @@ static struct i2c_driver aic32x4_i2c_driver = { 
module_i2c_driver(aic32x4_i2c_driver);



MODULE_DESCRIPTION("ASoC TLV320AIC32x4 codec driver I2C");

MODULE_AUTHOR("Jeremy McDermond <nh6z@nh6z.net>");

MODULE_AUTHOR("Annaliese McDermond <nh6z@nh6z.net>");

MODULE_LICENSE("GPL");

sound/soc/codecs/tlv320aic32x4-spi.c

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 *

 * Copyright 2011-2019 NW Digital Radio

 *

 * Author: Jeremy McDermond <nh6z@nh6z.net>

 * Author: Annaliese McDermond <nh6z@nh6z.net>

 *

 * Based on sound/soc/codecs/wm8974 and TI driver for kernel 2.6.27.

 *
@@ -64,5 +64,5 @@ static struct spi_driver aic32x4_spi_driver = { 
module_spi_driver(aic32x4_spi_driver);



MODULE_DESCRIPTION("ASoC TLV320AIC32x4 codec driver SPI");

MODULE_AUTHOR("Jeremy McDermond <nh6z@nh6z.net>");

MODULE_AUTHOR("Annaliese McDermond <nh6z@nh6z.net>");

MODULE_LICENSE("GPL");

sound/soc/codecs/tlv320aic32x4.c

+2 −0
Original line number Diff line number Diff line
@@ -443,6 +443,8 @@ static const struct snd_soc_dapm_widget aic32x4_dapm_widgets[] = { 
	SND_SOC_DAPM_INPUT("IN2_R"),

	SND_SOC_DAPM_INPUT("IN3_L"),

	SND_SOC_DAPM_INPUT("IN3_R"),

	SND_SOC_DAPM_INPUT("CM_L"),

	SND_SOC_DAPM_INPUT("CM_R"),

};



static const struct snd_soc_dapm_route aic32x4_dapm_routes[] = {

sound/soc/codecs/wm_adsp.c

+2 −1
Original line number Diff line number Diff line
@@ -3951,6 +3951,7 @@ int wm_adsp_compr_trigger(struct snd_compr_stream *stream, int cmd) 
		}

		break;

	case SNDRV_PCM_TRIGGER_STOP:

		if (wm_adsp_compr_attached(compr))

			wm_adsp_buffer_clear(compr->buf);

		break;

	default: