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

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

Merge remote-tracking branches 'asoc/fix/rt5670', 'asoc/fix/samsung' and... 

Merge remote-tracking branches 'asoc/fix/rt5670', 'asoc/fix/samsung' and 'asoc/fix/sgtl5000' into asoc-linus
parents 643aa2c5 96927ac9 62e6a3b6 c251ea7b

sound/soc/codecs/rt5670.c

+18 −18
Original line number Diff line number Diff line
@@ -100,18 +100,18 @@ static const struct reg_default rt5670_reg[] = { 
	{ 0x4c, 0x5380 },

	{ 0x4f, 0x0073 },

	{ 0x52, 0x00d3 },

	{ 0x53, 0xf0f0 },

	{ 0x53, 0xf000 },

	{ 0x61, 0x0000 },

	{ 0x62, 0x0001 },

	{ 0x63, 0x00c3 },

	{ 0x64, 0x0000 },

	{ 0x65, 0x0000 },

	{ 0x65, 0x0001 },

	{ 0x66, 0x0000 },

	{ 0x6f, 0x8000 },

	{ 0x70, 0x8000 },

	{ 0x71, 0x8000 },

	{ 0x72, 0x8000 },

	{ 0x73, 0x1110 },

	{ 0x73, 0x7770 },

	{ 0x74, 0x0e00 },

	{ 0x75, 0x1505 },

	{ 0x76, 0x0015 },
@@ -125,21 +125,21 @@ static const struct reg_default rt5670_reg[] = { 
	{ 0x83, 0x0000 },

	{ 0x84, 0x0000 },

	{ 0x85, 0x0000 },

	{ 0x86, 0x0008 },

	{ 0x86, 0x0004 },

	{ 0x87, 0x0000 },

	{ 0x88, 0x0000 },

	{ 0x89, 0x0000 },

	{ 0x8a, 0x0000 },

	{ 0x8b, 0x0000 },

	{ 0x8c, 0x0007 },

	{ 0x8c, 0x0003 },

	{ 0x8d, 0x0000 },

	{ 0x8e, 0x0004 },

	{ 0x8f, 0x1100 },

	{ 0x90, 0x0646 },

	{ 0x91, 0x0c06 },

	{ 0x93, 0x0000 },

	{ 0x94, 0x0000 },

	{ 0x95, 0x0000 },

	{ 0x94, 0x1270 },

	{ 0x95, 0x1000 },

	{ 0x97, 0x0000 },

	{ 0x98, 0x0000 },

	{ 0x99, 0x0000 },
@@ -150,11 +150,11 @@ static const struct reg_default rt5670_reg[] = { 
	{ 0x9e, 0x0400 },

	{ 0xae, 0x7000 },

	{ 0xaf, 0x0000 },

	{ 0xb0, 0x6000 },

	{ 0xb0, 0x7000 },

	{ 0xb1, 0x0000 },

	{ 0xb2, 0x0000 },

	{ 0xb3, 0x001f },

	{ 0xb4, 0x2206 },

	{ 0xb4, 0x220c },

	{ 0xb5, 0x1f00 },

	{ 0xb6, 0x0000 },

	{ 0xb7, 0x0000 },
@@ -171,25 +171,25 @@ static const struct reg_default rt5670_reg[] = { 
	{ 0xcf, 0x1813 },

	{ 0xd0, 0x0690 },

	{ 0xd1, 0x1c17 },

	{ 0xd3, 0xb320 },

	{ 0xd3, 0xa220 },

	{ 0xd4, 0x0000 },

	{ 0xd6, 0x0400 },

	{ 0xd9, 0x0809 },

	{ 0xda, 0x0000 },

	{ 0xdb, 0x0001 },

	{ 0xdc, 0x0049 },

	{ 0xdd, 0x0009 },

	{ 0xdd, 0x0024 },

	{ 0xe6, 0x8000 },

	{ 0xe7, 0x0000 },

	{ 0xec, 0xb300 },

	{ 0xec, 0xa200 },

	{ 0xed, 0x0000 },

	{ 0xee, 0xb300 },

	{ 0xee, 0xa200 },

	{ 0xef, 0x0000 },

	{ 0xf8, 0x0000 },

	{ 0xf9, 0x0000 },

	{ 0xfa, 0x8010 },

	{ 0xfb, 0x0033 },

	{ 0xfc, 0x0080 },

	{ 0xfc, 0x0100 },

};



static bool rt5670_volatile_register(struct device *dev, unsigned int reg)
@@ -1877,6 +1877,10 @@ static const struct snd_soc_dapm_route rt5670_dapm_routes[] = { 
	{ "DAC1 MIXR", "DAC1 Switch", "DAC1 R Mux" },

	{ "DAC1 MIXR", NULL, "DAC Stereo1 Filter" },



	{ "DAC Stereo1 Filter", NULL, "PLL1", is_sys_clk_from_pll },

	{ "DAC Mono Left Filter", NULL, "PLL1", is_sys_clk_from_pll },

	{ "DAC Mono Right Filter", NULL, "PLL1", is_sys_clk_from_pll },



	{ "DAC MIX", NULL, "DAC1 MIXL" },

	{ "DAC MIX", NULL, "DAC1 MIXR" },
@@ -1926,14 +1930,10 @@ static const struct snd_soc_dapm_route rt5670_dapm_routes[] = { 


	{ "DAC L1", NULL, "DAC L1 Power" },

	{ "DAC L1", NULL, "Stereo DAC MIXL" },

	{ "DAC L1", NULL, "PLL1", is_sys_clk_from_pll },

	{ "DAC R1", NULL, "DAC R1 Power" },

	{ "DAC R1", NULL, "Stereo DAC MIXR" },

	{ "DAC R1", NULL, "PLL1", is_sys_clk_from_pll },

	{ "DAC L2", NULL, "Mono DAC MIXL" },

	{ "DAC L2", NULL, "PLL1", is_sys_clk_from_pll },

	{ "DAC R2", NULL, "Mono DAC MIXR" },

	{ "DAC R2", NULL, "PLL1", is_sys_clk_from_pll },



	{ "OUT MIXL", "BST1 Switch", "BST1" },

	{ "OUT MIXL", "INL Switch", "INL VOL" },

sound/soc/codecs/sgtl5000.c

+1 −2
Original line number Diff line number Diff line
@@ -1299,8 +1299,7 @@ static int sgtl5000_probe(struct snd_soc_codec *codec) 


	/* enable small pop, introduce 400ms delay in turning off */

	snd_soc_update_bits(codec, SGTL5000_CHIP_REF_CTRL,

				SGTL5000_SMALL_POP,

				SGTL5000_SMALL_POP);

				SGTL5000_SMALL_POP, 1);



	/* disable short cut detector */

	snd_soc_write(codec, SGTL5000_CHIP_SHORT_CTRL, 0);

sound/soc/codecs/sgtl5000.h

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ 
#define SGTL5000_BIAS_CTRL_MASK			0x000e

#define SGTL5000_BIAS_CTRL_SHIFT		1

#define SGTL5000_BIAS_CTRL_WIDTH		3

#define SGTL5000_SMALL_POP			0x0001

#define SGTL5000_SMALL_POP			0



/*

 * SGTL5000_CHIP_MIC_CTRL

sound/soc/samsung/snow.c

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ static const struct of_device_id snow_of_match[] = { 
	{ .compatible = "google,snow-audio-max98095", },

	{},

};

MODULE_DEVICE_TABLE(of, snow_of_match);



static struct platform_driver snow_driver = {

	.driver = {