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

Commit 4b2fe382 authored by Bard Liao's avatar Bard Liao Committed by Mark Brown
Browse files

ASoC: rt298: enable IRQ for jack detection 



There are some registers needed for enabling rt298 IRQ missed on
current driver.

Signed-off-by: default avatarBard Liao <bardliao@realtek.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 92e963f5

sound/soc/codecs/rt298.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -1225,6 +1225,12 @@ static int rt298_i2c_probe(struct i2c_client *i2c, 
	regmap_update_bits(rt298->regmap,

	regmap_update_bits(rt298->regmap,

				RT298_WIND_FILTER_CTRL, 0x0082, 0x0082);

				RT298_WIND_FILTER_CTRL, 0x0082, 0x0082);

	regmap_update_bits(rt298->regmap, RT298_IRQ_CTRL, 0x2, 0x2);

	regmap_update_bits(rt298->regmap, RT298_IRQ_CTRL, 0x2, 0x2);



	regmap_write(rt298->regmap, RT298_UNSOLICITED_INLINE_CMD, 0x81);

	regmap_write(rt298->regmap, RT298_UNSOLICITED_HP_OUT, 0x82);

	regmap_write(rt298->regmap, RT298_UNSOLICITED_MIC1, 0x84);

	regmap_update_bits(rt298->regmap, RT298_IRQ_FLAG_CTRL, 0x2, 0x2);



	rt298->is_hp_in = -1;

	rt298->is_hp_in = -1;





	if (rt298->i2c->irq) {

	if (rt298->i2c->irq) {

sound/soc/codecs/rt298.h

+8 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ 
#define RT298_HP_OUT					0x21

#define RT298_HP_OUT					0x21

#define RT298_MIXER_IN1					0x22

#define RT298_MIXER_IN1					0x22

#define RT298_MIXER_IN2					0x23

#define RT298_MIXER_IN2					0x23

#define RT298_INLINE_CMD				0x55





#define RT298_SET_PIN_SFT				6

#define RT298_SET_PIN_SFT				6

#define RT298_SET_PIN_ENABLE				0x40

#define RT298_SET_PIN_ENABLE				0x40
@@ -124,6 +125,12 @@ 
	VERB_CMD(AC_VERB_SET_COEF_INDEX, RT298_VENDOR_REGISTERS, 0)

	VERB_CMD(AC_VERB_SET_COEF_INDEX, RT298_VENDOR_REGISTERS, 0)

#define RT298_PROC_COEF\

#define RT298_PROC_COEF\

	VERB_CMD(AC_VERB_SET_PROC_COEF, RT298_VENDOR_REGISTERS, 0)

	VERB_CMD(AC_VERB_SET_PROC_COEF, RT298_VENDOR_REGISTERS, 0)

#define RT298_UNSOLICITED_INLINE_CMD\

	VERB_CMD(AC_VERB_SET_UNSOLICITED_ENABLE, RT298_INLINE_CMD, 0)

#define RT298_UNSOLICITED_HP_OUT\

	VERB_CMD(AC_VERB_SET_UNSOLICITED_ENABLE, RT298_HP_OUT, 0)

#define RT298_UNSOLICITED_MIC1\

	VERB_CMD(AC_VERB_SET_UNSOLICITED_ENABLE, RT298_MIC1, 0)





/* Index registers */

/* Index registers */

#define RT298_A_BIAS_CTRL1	0x01

#define RT298_A_BIAS_CTRL1	0x01
@@ -148,6 +155,7 @@ 
#define RT298_DEPOP_CTRL2	0x67

#define RT298_DEPOP_CTRL2	0x67

#define RT298_DEPOP_CTRL3	0x68

#define RT298_DEPOP_CTRL3	0x68

#define RT298_DEPOP_CTRL4	0x69

#define RT298_DEPOP_CTRL4	0x69

#define RT298_IRQ_FLAG_CTRL	0x7c





/* SPDIF (0x06) */

/* SPDIF (0x06) */

#define RT298_SPDIF_SEL_SFT	0

#define RT298_SPDIF_SEL_SFT	0