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

Commit 60668a2d authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/rt5663', 'asoc/fix/rt5665',... 

Merge remote-tracking branches 'asoc/fix/rt5663', 'asoc/fix/rt5665', 'asoc/fix/samsung', 'asoc/fix/sgtl5000' and 'asoc/fix/sh' into asoc-linus
parents 440174ac 9f8f5b5f 7e5824c9 9d154e42 364e93ca 295c5ba4

sound/soc/codecs/rt5663.c

+9 −9
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ static const struct reg_default rt5663_reg[] = { 
	{ 0x0006, 0x1000 },

	{ 0x000a, 0x0000 },

	{ 0x0010, 0x000f },

	{ 0x0015, 0x42c1 },

	{ 0x0015, 0x42f1 },

	{ 0x0016, 0x0000 },

	{ 0x0018, 0x000b },

	{ 0x0019, 0xafaf },
@@ -509,7 +509,7 @@ static const struct reg_default rt5663_reg[] = { 
	{ 0x008a, 0x0000 },

	{ 0x008b, 0x0000 },

	{ 0x008c, 0x0003 },

	{ 0x008e, 0x0004 },

	{ 0x008e, 0x0008 },

	{ 0x008f, 0x1000 },

	{ 0x0090, 0x0646 },

	{ 0x0091, 0x0e3e },
@@ -520,7 +520,7 @@ static const struct reg_default rt5663_reg[] = { 
	{ 0x0098, 0x0000 },

	{ 0x009a, 0x0000 },

	{ 0x009f, 0x0000 },

	{ 0x00ae, 0x2000 },

	{ 0x00ae, 0x6000 },

	{ 0x00af, 0x0000 },

	{ 0x00b6, 0x0000 },

	{ 0x00b7, 0x0000 },
@@ -538,7 +538,7 @@ static const struct reg_default rt5663_reg[] = { 
	{ 0x00d9, 0x08f9 },

	{ 0x00db, 0x0008 },

	{ 0x00dc, 0x00c0 },

	{ 0x00dd, 0x6724 },

	{ 0x00dd, 0x6729 },

	{ 0x00de, 0x3131 },

	{ 0x00df, 0x0008 },

	{ 0x00e0, 0x4000 },
@@ -578,7 +578,7 @@ static const struct reg_default rt5663_reg[] = { 
	{ 0x0116, 0x0000 },

	{ 0x0117, 0x0f00 },

	{ 0x0118, 0x0006 },

	{ 0x0125, 0x2224 },

	{ 0x0125, 0x2424 },

	{ 0x0126, 0x5550 },

	{ 0x0127, 0x0400 },

	{ 0x0128, 0x7711 },
@@ -596,8 +596,8 @@ static const struct reg_default rt5663_reg[] = { 
	{ 0x0145, 0x0002 },

	{ 0x0146, 0x0000 },

	{ 0x0160, 0x0e80 },

	{ 0x0161, 0x0020 },

	{ 0x0162, 0x0080 },

	{ 0x0161, 0x0080 },

	{ 0x0162, 0x0200 },

	{ 0x0163, 0x0800 },

	{ 0x0164, 0x0000 },

	{ 0x0165, 0x0000 },
@@ -676,8 +676,8 @@ static const struct reg_default rt5663_reg[] = { 
	{ 0x0251, 0x0000 },

	{ 0x0252, 0x028a },

	{ 0x02fa, 0x0000 },

	{ 0x02fb, 0x0000 },

	{ 0x02fc, 0x0000 },

	{ 0x02fb, 0x00a4 },

	{ 0x02fc, 0x0300 },

	{ 0x0300, 0x0000 },

	{ 0x03d0, 0x0000 },

	{ 0x03d1, 0x0000 },

sound/soc/codecs/rt5665.c

+2 −2
Original line number Diff line number Diff line
@@ -4368,12 +4368,12 @@ static int rt5665_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio) 
		switch (dai->id) {

		case RT5665_AIF2_1:

		case RT5665_AIF2_2:

			snd_soc_update_bits(codec, RT5665_ADDA_CLK_1,

			snd_soc_update_bits(codec, RT5665_ADDA_CLK_2,

				RT5665_I2S_BCLK_MS2_MASK,

				RT5665_I2S_BCLK_MS2_64);

			break;

		case RT5665_AIF3:

			snd_soc_update_bits(codec, RT5665_ADDA_CLK_1,

			snd_soc_update_bits(codec, RT5665_ADDA_CLK_2,

				RT5665_I2S_BCLK_MS3_MASK,

				RT5665_I2S_BCLK_MS3_64);

			break;

sound/soc/codecs/rt5665.h

+2 −2
Original line number Diff line number Diff line
@@ -1692,8 +1692,8 @@ 
#define RT5665_GP6_PIN_MASK			(0x3 << 5)

#define RT5665_GP6_PIN_SFT			5

#define RT5665_GP6_PIN_GPIO6			(0x0 << 5)

#define RT5665_GP6_PIN_BCLK3			(0x0 << 5)

#define RT5665_GP6_PIN_PDM_SCL			(0x1 << 5)

#define RT5665_GP6_PIN_BCLK3			(0x1 << 5)

#define RT5665_GP6_PIN_PDM_SCL			(0x2 << 5)

#define RT5665_GP7_PIN_MASK			(0x3 << 3)

#define RT5665_GP7_PIN_SFT			3

#define RT5665_GP7_PIN_GPIO7			(0x0 << 3)

sound/soc/codecs/sgtl5000.c

+2 −2
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ static int dac_put_volsw(struct snd_kcontrol *kcontrol, 
static int avc_get_threshold(struct snd_kcontrol *kcontrol,

			     struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	int db, i;

	u16 reg = snd_soc_read(codec, SGTL5000_DAP_AVC_THRESHOLD);
@@ -442,7 +442,7 @@ static int avc_get_threshold(struct snd_kcontrol *kcontrol, 
static int avc_put_threshold(struct snd_kcontrol *kcontrol,

			     struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	int db;

	u16 reg;

sound/soc/samsung/odroid.c

+3 −3
Original line number Diff line number Diff line
@@ -42,17 +42,17 @@ static int odroid_card_hw_params(struct snd_pcm_substream *substream, 
	switch (params_rate(params)) {

	case 32000:

	case 64000:

		pll_freq = 131072000U;

		pll_freq = 131072006U;

		break;

	case 44100:

	case 88200:

	case 176400:

		pll_freq = 180633600U;

		pll_freq = 180633609U;

		break;

	case 48000:

	case 96000:

	case 192000:

		pll_freq = 196608000U;

		pll_freq = 196608001U;

		break;

	default:

		return -EINVAL;