tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Mark Brown 78be55af 74d33293

+6
+2
sound/soc/codecs/rt5645.c
··· 3341 3341 break; 3342 3342 3343 3343 case RT5645_DMIC_DATA_GPIO5: 3344 + regmap_update_bits(rt5645->regmap, RT5645_GPIO_CTRL1, 3345 + RT5645_I2S2_DAC_PIN_MASK, RT5645_I2S2_DAC_PIN_GPIO); 3344 3346 regmap_update_bits(rt5645->regmap, RT5645_DMIC_CTRL1, 3345 3347 RT5645_DMIC_1_DP_MASK, RT5645_DMIC_1_DP_GPIO5); 3346 3348 regmap_update_bits(rt5645->regmap, RT5645_GPIO_CTRL1,
+4
sound/soc/codecs/rt5645.h
··· 1693 1693 #define RT5645_GP6_PIN_SFT 6 1694 1694 #define RT5645_GP6_PIN_GPIO6 (0x0 << 6) 1695 1695 #define RT5645_GP6_PIN_DMIC2_SDA (0x1 << 6) 1696 + #define RT5645_I2S2_DAC_PIN_MASK (0x1 << 4) 1697 + #define RT5645_I2S2_DAC_PIN_SFT 4 1698 + #define RT5645_I2S2_DAC_PIN_I2S (0x0 << 4) 1699 + #define RT5645_I2S2_DAC_PIN_GPIO (0x1 << 4) 1696 1700 #define RT5645_GP8_PIN_MASK (0x1 << 3) 1697 1701 #define RT5645_GP8_PIN_SFT 3 1698 1702 #define RT5645_GP8_PIN_GPIO8 (0x0 << 3)