diff options
| author | Mark Brown <broonie@kernel.org> | 2015-08-06 14:39:07 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-08-06 14:39:07 +0300 |
| commit | 78be55af0d6092dd7ec19c0c7b2f381383af1a95 (patch) | |
| tree | baf5ac96ac7c7b86f86bdc1c21aece962bbc6800 /sound | |
| parent | 74d33293e467df61de1b1d8b2fbe29e550dec33b (diff) | |
| parent | a094935e4ebdf5c22c45b8aeeb2d88e9e8c53dbf (diff) | |
| download | linux-78be55af0d6092dd7ec19c0c7b2f381383af1a95.tar.xz | |
Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/rt5645.c | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/rt5645.h | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index e9cc3aae5366..961bd7e5877e 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -3341,6 +3341,8 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, break; 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, RT5645_DMIC_1_DP_MASK, RT5645_DMIC_1_DP_GPIO5); regmap_update_bits(rt5645->regmap, RT5645_GPIO_CTRL1, diff --git a/sound/soc/codecs/rt5645.h b/sound/soc/codecs/rt5645.h index 0353a6a273ab..278bb9f464c4 100644 --- a/sound/soc/codecs/rt5645.h +++ b/sound/soc/codecs/rt5645.h @@ -1693,6 +1693,10 @@ #define RT5645_GP6_PIN_SFT 6 #define RT5645_GP6_PIN_GPIO6 (0x0 << 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_SFT 3 #define RT5645_GP8_PIN_GPIO8 (0x0 << 3) |