ASoC: rt5665: fix define of RT5665_HP_DRIVER_5X
Subsystems (3)
PATCH 1/2 ASoC: rt5665: fix define of RT5665_HP_DRIVER_5X
It is (0x3 << 2), not (0x2 << 2).
--- sound/soc/codecs/rt5665.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/rt5665.h +1 -1
@@ -1106,7 +1106,7 @@#define RT5665_HP_DRIVER_MASK (0x3 << 2)#define RT5665_HP_DRIVER_1X (0x0 << 2)#define RT5665_HP_DRIVER_3X (0x1 << 2) -#define RT5665_HP_DRIVER_5X (0x2 << 2) +#define RT5665_HP_DRIVER_5X (0x3 << 2)#define RT5665_LDO1_DVO_MASK (0x3)#define RT5665_LDO1_DVO_09 (0x0)#define RT5665_LDO1_DVO_10 (0x1)
Signature · 1 line
2.7.4
PATCH 2/2 ASoC: rt5665: set i2s pin share configuration
I2S2 and I2S3 are share pins. We need to configure it when i2s is active and disable it when i2s is inactive. To disable i2s pins means to set them as gpio.
--- sound/soc/codecs/rt5665.c | 58 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 3 deletions(-)
sound/soc/codecs/rt5665.c +55 -3
@@ -2604,6 +2604,55 @@ static int rt5655_set_verf(struct snd_soc_dapm_widget *w,return 0 ; } +static int rt5665_i2s_pin_event (struct snd_soc_dapm_widget *w, +struct snd_kcontrol *kcontrol,int event) +{ +struct snd_soc_codec *codec =snd_soc_dapm_to_codec (w->dapm); +unsigned int val1, val2, mask1, mask2 =0 ; + +switch (w->shift) { +case RT5665_PWR_I2S2_1_BIT : + mask1 =RT5665_GP2_PIN_MASK |RT5665_GP3_PIN_MASK | +RT5665_GP4_PIN_MASK |RT5665_GP5_PIN_MASK ; + val1 =RT5665_GP2_PIN_BCLK2 |RT5665_GP3_PIN_LRCK2 | +RT5665_GP4_PIN_DACDAT2_1 |RT5665_GP5_PIN_ADCDAT2_1 ; +break ; +case RT5665_PWR_I2S2_2_BIT : + mask1 =RT5665_GP2_PIN_MASK |RT5665_GP3_PIN_MASK | +RT5665_GP8_PIN_MASK ; + val1 =RT5665_GP2_PIN_BCLK2 |RT5665_GP3_PIN_LRCK2 | +RT5665_GP8_PIN_DACDAT2_2 ; + mask2 =RT5665_GP9_PIN_MASK ; + val2 =RT5665_GP9_PIN_ADCDAT2_2 ; +break ; +case RT5665_PWR_I2S3_BIT : + mask1 =RT5665_GP6_PIN_MASK |RT5665_GP7_PIN_MASK | +RT5665_GP8_PIN_MASK ; + val1 =RT5665_GP6_PIN_BCLK3 |RT5665_GP7_PIN_LRCK3 | +RT5665_GP8_PIN_DACDAT3 ; + mask2 =RT5665_GP9_PIN_MASK ; + val2 =RT5665_GP9_PIN_ADCDAT3 ; +break ; + } +switch (event) { +case SND_SOC_DAPM_PRE_PMU : +snd_soc_update_bits (codec,RT5665_GPIO_CTRL_1 , mask1, val1); +if (mask2) +snd_soc_update_bits (codec,RT5665_GPIO_CTRL_2 , + mask2, val2); +break ; +case SND_SOC_DAPM_POST_PMD : +snd_soc_update_bits (codec,RT5665_GPIO_CTRL_1 , mask1,0 ); +if (mask2) +snd_soc_update_bits (codec,RT5665_GPIO_CTRL_2 , + mask2,0 ); +break ; +default : +return 0 ; + } + +return 0 ; +}static const struct snd_soc_dapm_widget rt5665_dapm_widgets[] = { SND_SOC_DAPM_SUPPLY("LDO2", RT5665_PWR_ANLG_3, RT5665_PWR_LDO2_BIT, 0,
@@ -2856,11 +2905,14 @@ static const struct snd_soc_dapm_widget rt5665_dapm_widgets[] = {SND_SOC_DAPM_SUPPLY ("I2S1_2" ,RT5665_PWR_DIG_1 ,RT5665_PWR_I2S1_2_BIT ,0 ,NULL ,0 ),SND_SOC_DAPM_SUPPLY ("I2S2_1" ,RT5665_PWR_DIG_1 ,RT5665_PWR_I2S2_1_BIT , -0 ,NULL ,0 ), +0 , rt5665_i2s_pin_event,SND_SOC_DAPM_PRE_PMU | +SND_SOC_DAPM_POST_PMD ),SND_SOC_DAPM_SUPPLY ("I2S2_2" ,RT5665_PWR_DIG_1 ,RT5665_PWR_I2S2_2_BIT , -0 ,NULL ,0 ), +0 , rt5665_i2s_pin_event,SND_SOC_DAPM_PRE_PMU | +SND_SOC_DAPM_POST_PMD ),SND_SOC_DAPM_SUPPLY ("I2S3" ,RT5665_PWR_DIG_1 ,RT5665_PWR_I2S3_BIT , -0 ,NULL ,0 ), +0 , rt5665_i2s_pin_event,SND_SOC_DAPM_PRE_PMU | +SND_SOC_DAPM_POST_PMD ),SND_SOC_DAPM_PGA ("IF1 DAC1" ,SND_SOC_NOPM ,0 ,0 ,NULL ,0 ),SND_SOC_DAPM_PGA ("IF1 DAC2" ,SND_SOC_NOPM ,0 ,0 ,NULL ,0 ), SND_SOC_DAPM_PGA("IF1 DAC3", SND_SOC_NOPM, 0, 0, NULL, 0),
Signature · 1 line
2.7.4
Mark Brown
maintainerApplied "ASoC: rt5665: set i2s pin share configuration" to the asoc tree
The patch
ASoC: rt5665: set i2s pin share configuration
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
9b5d3865b3b410d21213807642b47e84a3fc081bMon Sep 17 00:00:00 2001
From: Bard Liao <[email protected]>
Date: Thu, 16 Mar 2017 13:58:41 +0800
Subject: [PATCH] ASoC: rt5665: set i2s pin share configuration
I2S2 and I2S3 are share pins. We need to configure it when i2s is active and disable it when i2s is inactive. To disable i2s pins means to set them as gpio.
--- sound/soc/codecs/rt5665.c | 58 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 3 deletions(-)
sound/soc/codecs/rt5665.c +55 -3
@@ -2604,6 +2604,55 @@ static int rt5655_set_verf(struct snd_soc_dapm_widget *w,return 0 ; } +static int rt5665_i2s_pin_event (struct snd_soc_dapm_widget *w, +struct snd_kcontrol *kcontrol,int event) +{ +struct snd_soc_codec *codec =snd_soc_dapm_to_codec (w->dapm); +unsigned int val1, val2, mask1, mask2 =0 ; + +switch (w->shift) { +case RT5665_PWR_I2S2_1_BIT : + mask1 =RT5665_GP2_PIN_MASK |RT5665_GP3_PIN_MASK | +RT5665_GP4_PIN_MASK |RT5665_GP5_PIN_MASK ; + val1 =RT5665_GP2_PIN_BCLK2 |RT5665_GP3_PIN_LRCK2 | +RT5665_GP4_PIN_DACDAT2_1 |RT5665_GP5_PIN_ADCDAT2_1 ; +break ; +case RT5665_PWR_I2S2_2_BIT : + mask1 =RT5665_GP2_PIN_MASK |RT5665_GP3_PIN_MASK | +RT5665_GP8_PIN_MASK ; + val1 =RT5665_GP2_PIN_BCLK2 |RT5665_GP3_PIN_LRCK2 | +RT5665_GP8_PIN_DACDAT2_2 ; + mask2 =RT5665_GP9_PIN_MASK ; + val2 =RT5665_GP9_PIN_ADCDAT2_2 ; +break ; +case RT5665_PWR_I2S3_BIT : + mask1 =RT5665_GP6_PIN_MASK |RT5665_GP7_PIN_MASK | +RT5665_GP8_PIN_MASK ; + val1 =RT5665_GP6_PIN_BCLK3 |RT5665_GP7_PIN_LRCK3 | +RT5665_GP8_PIN_DACDAT3 ; + mask2 =RT5665_GP9_PIN_MASK ; + val2 =RT5665_GP9_PIN_ADCDAT3 ; +break ; + } +switch (event) { +case SND_SOC_DAPM_PRE_PMU : +snd_soc_update_bits (codec,RT5665_GPIO_CTRL_1 , mask1, val1); +if (mask2) +snd_soc_update_bits (codec,RT5665_GPIO_CTRL_2 , + mask2, val2); +break ; +case SND_SOC_DAPM_POST_PMD : +snd_soc_update_bits (codec,RT5665_GPIO_CTRL_1 , mask1,0 ); +if (mask2) +snd_soc_update_bits (codec,RT5665_GPIO_CTRL_2 , + mask2,0 ); +break ; +default : +return 0 ; + } + +return 0 ; +}static const struct snd_soc_dapm_widget rt5665_dapm_widgets[] = { SND_SOC_DAPM_SUPPLY("LDO2", RT5665_PWR_ANLG_3, RT5665_PWR_LDO2_BIT, 0,
@@ -2856,11 +2905,14 @@ static const struct snd_soc_dapm_widget rt5665_dapm_widgets[] = {SND_SOC_DAPM_SUPPLY ("I2S1_2" ,RT5665_PWR_DIG_1 ,RT5665_PWR_I2S1_2_BIT ,0 ,NULL ,0 ),SND_SOC_DAPM_SUPPLY ("I2S2_1" ,RT5665_PWR_DIG_1 ,RT5665_PWR_I2S2_1_BIT , -0 ,NULL ,0 ), +0 , rt5665_i2s_pin_event,SND_SOC_DAPM_PRE_PMU | +SND_SOC_DAPM_POST_PMD ),SND_SOC_DAPM_SUPPLY ("I2S2_2" ,RT5665_PWR_DIG_1 ,RT5665_PWR_I2S2_2_BIT , -0 ,NULL ,0 ), +0 , rt5665_i2s_pin_event,SND_SOC_DAPM_PRE_PMU | +SND_SOC_DAPM_POST_PMD ),SND_SOC_DAPM_SUPPLY ("I2S3" ,RT5665_PWR_DIG_1 ,RT5665_PWR_I2S3_BIT , -0 ,NULL ,0 ), +0 , rt5665_i2s_pin_event,SND_SOC_DAPM_PRE_PMU | +SND_SOC_DAPM_POST_PMD ),SND_SOC_DAPM_PGA ("IF1 DAC1" ,SND_SOC_NOPM ,0 ,0 ,NULL ,0 ),SND_SOC_DAPM_PGA ("IF1 DAC2" ,SND_SOC_NOPM ,0 ,0 ,NULL ,0 ), SND_SOC_DAPM_PGA("IF1 DAC3", SND_SOC_NOPM, 0, 0, NULL, 0),
Signature · 1 line
2.11.0
Mark Brown
maintainerApplied "ASoC: rt5665: fix define of RT5665_HP_DRIVER_5X" to the asoc tree
In reply to Bard LiaoThe patch
ASoC: rt5665: fix define of RT5665_HP_DRIVER_5X
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
763811987d5088d0461164f80e9d16869847a040Mon Sep 17 00:00:00 2001
From: Bard Liao <[email protected]>
Date: Thu, 16 Mar 2017 13:58:40 +0800
Subject: [PATCH] ASoC: rt5665: fix define of RT5665_HP_DRIVER_5X
It is (0x3 << 2), not (0x2 << 2).
--- sound/soc/codecs/rt5665.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/rt5665.h +1 -1
@@ -1106,7 +1106,7 @@#define RT5665_HP_DRIVER_MASK (0x3 << 2)#define RT5665_HP_DRIVER_1X (0x0 << 2)#define RT5665_HP_DRIVER_3X (0x1 << 2) -#define RT5665_HP_DRIVER_5X (0x2 << 2) +#define RT5665_HP_DRIVER_5X (0x3 << 2)#define RT5665_LDO1_DVO_MASK (0x3)#define RT5665_LDO1_DVO_09 (0x0)#define RT5665_LDO1_DVO_10 (0x1)
Signature · 1 line
2.11.0