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

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

Merge remote-tracking branches 'asoc/topic/bt-sco', 'asoc/topic/cs35l32',... 

Merge remote-tracking branches 'asoc/topic/bt-sco', 'asoc/topic/cs35l32', 'asoc/topic/cs42l52' and 'asoc/topic/cs42l56' into asoc-next
parents db5cdb34 a465122a d883641f b5fbcbab cf0efa1c

sound/soc/codecs/bt-sco.c

+1 −1
Original line number Diff line number Diff line
@@ -86,5 +86,5 @@ static struct platform_driver bt_sco_driver = { 
module_platform_driver(bt_sco_driver);



MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");

MODULE_DESCRIPTION("ASoC generic bluethooth sco link driver");

MODULE_DESCRIPTION("ASoC generic bluetooth sco link driver");

MODULE_LICENSE("GPL");

sound/soc/codecs/cs35l32.c

+2 −2
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ static int cs35l32_codec_set_sysclk(struct snd_soc_codec *codec, 
			CS35L32_MCLK_DIV2_MASK | CS35L32_MCLK_RATIO_MASK, val);

}



static struct snd_soc_codec_driver soc_codec_dev_cs35l32 = {

static const struct snd_soc_codec_driver soc_codec_dev_cs35l32 = {

	.set_sysclk = cs35l32_codec_set_sysclk,



	.dapm_widgets = cs35l32_dapm_widgets,
@@ -288,7 +288,7 @@ static const struct reg_default cs35l32_monitor_patch[] = { 
	{ 0x00, 0x00 },

};



static struct regmap_config cs35l32_regmap = {

static const struct regmap_config cs35l32_regmap = {

	.reg_bits = 8,

	.val_bits = 8,

sound/soc/codecs/cs42l52.c

+2 −2
Original line number Diff line number Diff line
@@ -1103,7 +1103,7 @@ static int cs42l52_remove(struct snd_soc_codec *codec) 
	return 0;

}



static struct snd_soc_codec_driver soc_codec_dev_cs42l52 = {

static const struct snd_soc_codec_driver soc_codec_dev_cs42l52 = {

	.probe = cs42l52_probe,

	.remove = cs42l52_remove,

	.set_bias_level = cs42l52_set_bias_level,
@@ -1130,7 +1130,7 @@ static const struct reg_default cs42l52_threshold_patch[] = { 


};



static struct regmap_config cs42l52_regmap = {

static const struct regmap_config cs42l52_regmap = {

	.reg_bits = 8,

	.val_bits = 8,

sound/soc/codecs/cs42l56.c

+2 −2
Original line number Diff line number Diff line
@@ -1164,7 +1164,7 @@ static int cs42l56_remove(struct snd_soc_codec *codec) 
	return 0;

}



static struct snd_soc_codec_driver soc_codec_dev_cs42l56 = {

static const struct snd_soc_codec_driver soc_codec_dev_cs42l56 = {

	.probe = cs42l56_probe,

	.remove = cs42l56_remove,

	.set_bias_level = cs42l56_set_bias_level,
@@ -1179,7 +1179,7 @@ static struct snd_soc_codec_driver soc_codec_dev_cs42l56 = { 
	.num_controls = ARRAY_SIZE(cs42l56_snd_controls),

};



static struct regmap_config cs42l56_regmap = {

static const struct regmap_config cs42l56_regmap = {

	.reg_bits = 8,

	.val_bits = 8,