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

Commit 7d9fb377 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branches 'topic/owner' and 'topic/reg-default' of... 

Merge branches 'topic/owner' and 'topic/reg-default' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-max9877
parents 1c07a4de c418a84a

sound/soc/codecs/adav80x.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -113,7 +113,7 @@ 




#define ADAV80X_PLL_OUTE_SYSCLKPD(x)		BIT(2 - (x))

#define ADAV80X_PLL_OUTE_SYSCLKPD(x)		BIT(2 - (x))





static struct reg_default adav80x_reg_defaults[] = {

static const struct reg_default adav80x_reg_defaults[] = {

	{ ADAV80X_PLAYBACK_CTRL,	0x01 },

	{ ADAV80X_PLAYBACK_CTRL,	0x01 },

	{ ADAV80X_AUX_IN_CTRL,		0x01 },

	{ ADAV80X_AUX_IN_CTRL,		0x01 },

	{ ADAV80X_REC_CTRL,		0x02 },

	{ ADAV80X_REC_CTRL,		0x02 },

sound/soc/codecs/alc5632.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ 
/*

/*

 * ALC5632 register cache

 * ALC5632 register cache

 */

 */

static struct reg_default  alc5632_reg_defaults[] = {

static const struct reg_default alc5632_reg_defaults[] = {

	{   2, 0x8080 },	/* R2   - Speaker Output Volume */

	{   2, 0x8080 },	/* R2   - Speaker Output Volume */

	{   4, 0x8080 },	/* R4   - Headphone Output Volume */

	{   4, 0x8080 },	/* R4   - Headphone Output Volume */

	{   6, 0x8080 },	/* R6   - AUXOUT Volume */

	{   6, 0x8080 },	/* R6   - AUXOUT Volume */

sound/soc/codecs/da7210.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -680,7 +680,7 @@ struct da7210_priv { 
	int master;

	int master;

};

};





static struct reg_default da7210_reg_defaults[] = {

static const struct reg_default da7210_reg_defaults[] = {

	{ 0x00, 0x00 },

	{ 0x00, 0x00 },

	{ 0x01, 0x11 },

	{ 0x01, 0x11 },

	{ 0x03, 0x00 },

	{ 0x03, 0x00 },
@@ -1182,7 +1182,7 @@ static struct snd_soc_codec_driver soc_codec_dev_da7210 = { 




#if IS_ENABLED(CONFIG_I2C)

#if IS_ENABLED(CONFIG_I2C)





static struct reg_default da7210_regmap_i2c_patch[] = {

static const struct reg_default da7210_regmap_i2c_patch[] = {





	/* System controller master disable */

	/* System controller master disable */

	{ DA7210_STARTUP1, 0x00 },

	{ DA7210_STARTUP1, 0x00 },
@@ -1268,7 +1268,7 @@ static struct i2c_driver da7210_i2c_driver = { 




#if defined(CONFIG_SPI_MASTER)

#if defined(CONFIG_SPI_MASTER)





static struct reg_default da7210_regmap_spi_patch[] = {

static const struct reg_default da7210_regmap_spi_patch[] = {

	/* Dummy read to give two pulses over nCS for SPI */

	/* Dummy read to give two pulses over nCS for SPI */

	{ DA7210_AUX2, 0x00 },

	{ DA7210_AUX2, 0x00 },

	{ DA7210_AUX2, 0x00 },

	{ DA7210_AUX2, 0x00 },

sound/soc/codecs/da7213.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -954,7 +954,7 @@ static const struct snd_soc_dapm_route da7213_audio_map[] = { 
	{"LINE", NULL, "Lineout PGA"},

	{"LINE", NULL, "Lineout PGA"},

};

};





static struct reg_default da7213_reg_defaults[] = {

static const struct reg_default da7213_reg_defaults[] = {

	{ DA7213_DIG_ROUTING_DAI, 0x10 },

	{ DA7213_DIG_ROUTING_DAI, 0x10 },

	{ DA7213_SR, 0x0A },

	{ DA7213_SR, 0x0A },

	{ DA7213_REFERENCES, 0x80 },

	{ DA7213_REFERENCES, 0x80 },

sound/soc/codecs/da732x.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -43,7 +43,7 @@ struct da732x_priv { 
/*

/*

 * da732x register cache - default settings

 * da732x register cache - default settings

 */

 */

static struct reg_default da732x_reg_cache[] = {

static const struct reg_default da732x_reg_cache[] = {

	{ DA732X_REG_REF1		, 0x02 },

	{ DA732X_REG_REF1		, 0x02 },

	{ DA732X_REG_BIAS_EN		, 0x80 },

	{ DA732X_REG_BIAS_EN		, 0x80 },

	{ DA732X_REG_BIAS1		, 0x00 },

	{ DA732X_REG_BIAS1		, 0x00 },