ASoC: rt5645: Fix lost pin setting for DMIC1
Subsystems (3)
PATCH 1/1 ASoC: rt5645: Fix lost pin setting for DMIC1
I2S2_DAC pin can be used for I2S or GPIO. We should set it as GPIO if we use GPIO5 as DMIC1 data pin.
--- sound/soc/codecs/rt5645.c | 2 ++ sound/soc/codecs/rt5645.h | 4 ++++ 2 files changed, 6 insertions(+)
sound/soc/codecs/rt5645.c +2 -0
@@ -3356,6 +3356,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,
sound/soc/codecs/rt5645.h +4 -0
@@ -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)
Signature · 1 line
1.8.1.1.439.g50a6b54
Mark Brown
maintainerApplied "ASoC: rt5645: Fix lost pin setting for DMIC1" to the asoc tree
The patch
ASoC: rt5645: Fix lost pin setting for DMIC1
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
a094935e4ebdf5c22c45b8aeeb2d88e9e8c53dbfMon Sep 17 00:00:00 2001
From: Bard Liao <[email protected]>
Date: Mon, 3 Aug 2015 12:17:39 +0800
Subject: [PATCH] ASoC: rt5645: Fix lost pin setting for DMIC1
I2S2_DAC pin can be used for I2S or GPIO. We should set it as GPIO if we use GPIO5 as DMIC1 data pin.
--- sound/soc/codecs/rt5645.c | 2 ++ sound/soc/codecs/rt5645.h | 4 ++++ 2 files changed, 6 insertions(+)
sound/soc/codecs/rt5645.c +2 -0
@@ -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,
sound/soc/codecs/rt5645.h +4 -0
@@ -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)
Signature · 1 line
2.1.4