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

Commit 78be55af authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-linus

parents 74d33293 a094935e

sound/soc/codecs/rt5645.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -3341,6 +3341,8 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, 
		break;

		break;





	case RT5645_DMIC_DATA_GPIO5:

	case RT5645_DMIC_DATA_GPIO5:

		regmap_update_bits(rt5645->regmap, RT5645_GPIO_CTRL1,

			RT5645_I2S2_DAC_PIN_MASK, RT5645_I2S2_DAC_PIN_GPIO);

		regmap_update_bits(rt5645->regmap, RT5645_DMIC_CTRL1,

		regmap_update_bits(rt5645->regmap, RT5645_DMIC_CTRL1,

			RT5645_DMIC_1_DP_MASK, RT5645_DMIC_1_DP_GPIO5);

			RT5645_DMIC_1_DP_MASK, RT5645_DMIC_1_DP_GPIO5);

		regmap_update_bits(rt5645->regmap, RT5645_GPIO_CTRL1,

		regmap_update_bits(rt5645->regmap, RT5645_GPIO_CTRL1,

sound/soc/codecs/rt5645.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -1693,6 +1693,10 @@ 
#define RT5645_GP6_PIN_SFT			6

#define RT5645_GP6_PIN_SFT			6

#define RT5645_GP6_PIN_GPIO6			(0x0 << 6)

#define RT5645_GP6_PIN_GPIO6			(0x0 << 6)

#define RT5645_GP6_PIN_DMIC2_SDA		(0x1 << 6)

#define RT5645_GP6_PIN_DMIC2_SDA		(0x1 << 6)

#define RT5645_I2S2_DAC_PIN_MASK		(0x1 << 4)

#define RT5645_I2S2_DAC_PIN_SFT			4

#define RT5645_I2S2_DAC_PIN_I2S			(0x0 << 4)

#define RT5645_I2S2_DAC_PIN_GPIO		(0x1 << 4)

#define RT5645_GP8_PIN_MASK			(0x1 << 3)

#define RT5645_GP8_PIN_MASK			(0x1 << 3)

#define RT5645_GP8_PIN_SFT			3

#define RT5645_GP8_PIN_SFT			3

#define RT5645_GP8_PIN_GPIO8			(0x0 << 3)

#define RT5645_GP8_PIN_GPIO8			(0x0 << 3)