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

Unverified Commit 8dc7e208 authored by Mark Brown's avatar Mark Brown
Browse files

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

Merge remote-tracking branches 'asoc/fix/rt5663', 'asoc/fix/tlv320aic31xx' and 'asoc/fix/twl4030' into asoc-linus
parents 38acd9b8 958d022e 737e0b7b 15f8c5f2

sound/soc/codecs/rt5663.c

+4 −0
Original line number Diff line number Diff line
@@ -1560,6 +1560,10 @@ static int rt5663_jack_detect(struct snd_soc_codec *codec, int jack_insert) 
			RT5663_IRQ_POW_SAV_MASK, RT5663_IRQ_POW_SAV_EN);

		snd_soc_update_bits(codec, RT5663_IRQ_1,

			RT5663_EN_IRQ_JD1_MASK, RT5663_EN_IRQ_JD1_EN);

		snd_soc_update_bits(codec, RT5663_EM_JACK_TYPE_1,

			RT5663_EM_JD_MASK, RT5663_EM_JD_RST);

		snd_soc_update_bits(codec, RT5663_EM_JACK_TYPE_1,

			RT5663_EM_JD_MASK, RT5663_EM_JD_NOR);



		while (true) {

			regmap_read(rt5663->regmap, RT5663_INT_ST_2, &val);

sound/soc/codecs/rt5663.h

+4 −0
Original line number Diff line number Diff line
@@ -1029,6 +1029,10 @@ 
#define RT5663_POL_EXT_JD_SHIFT			10

#define RT5663_POL_EXT_JD_EN			(0x1 << 10)

#define RT5663_POL_EXT_JD_DIS			(0x0 << 10)

#define RT5663_EM_JD_MASK			(0x1 << 7)

#define RT5663_EM_JD_SHIFT			7

#define RT5663_EM_JD_NOR			(0x1 << 7)

#define RT5663_EM_JD_RST			(0x0 << 7)



/* DACREF LDO Control (0x0112)*/

#define RT5663_PWR_LDO_DACREFL_MASK		(0x1 << 9)

sound/soc/codecs/tlv320aic31xx.h

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ struct aic31xx_pdata { 
/* INT2 interrupt control */

#define AIC31XX_INT2CTRL	AIC31XX_REG(0, 49)

/* GPIO1 control */

#define AIC31XX_GPIO1		AIC31XX_REG(0, 50)

#define AIC31XX_GPIO1		AIC31XX_REG(0, 51)



#define AIC31XX_DACPRB		AIC31XX_REG(0, 60)

/* ADC Instruction Set Register */

sound/soc/codecs/twl4030.c

+3 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ static struct twl4030_codec_data *twl4030_get_pdata(struct snd_soc_codec *codec) 
	struct twl4030_codec_data *pdata = dev_get_platdata(codec->dev);

	struct device_node *twl4030_codec_node = NULL;



	twl4030_codec_node = of_find_node_by_name(codec->dev->parent->of_node,

	twl4030_codec_node = of_get_child_by_name(codec->dev->parent->of_node,

						  "codec");



	if (!pdata && twl4030_codec_node) {
@@ -241,9 +241,11 @@ static struct twl4030_codec_data *twl4030_get_pdata(struct snd_soc_codec *codec) 
				     GFP_KERNEL);

		if (!pdata) {

			dev_err(codec->dev, "Can not allocate memory\n");

			of_node_put(twl4030_codec_node);

			return NULL;

		}

		twl4030_setup_pdata_of(pdata, twl4030_codec_node);

		of_node_put(twl4030_codec_node);

	}



	return pdata;