leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: rt5640: Fix the wrong state of the JD in the HDA header

Browse Source 
The patch fixes the wrong state of the JD with 1M pull up resistor in the
HDA header.

Signed-off-by: Oder Chiou <oder_chiou@realtek.com>
Link: https://lore.kernel.org/r/20211201095629.21818-1-oder_chiou@realtek.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Oder Chiou 2021-12-01 17:56:29 +08:00 committed by Mark Brown
parent b80155fe61
commit e3dd4424c2
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sound/soc/codecs/rt5640.c
View File

@ -1973,7 +1973,7 @@ static int rt5640_set_bias_level(struct snd_soc_component *component,
RT5640_PWR_FV1 | RT5640_PWR_FV2,
RT5640_PWR_FV1 | RT5640_PWR_FV2);
snd_soc_component_update_bits(component, RT5640_DUMMY1,
0x0301, 0x0301);
0x1, 0x1);
snd_soc_component_update_bits(component, RT5640_MICBIAS,
0x0030, 0x0030);
}
@ -2533,7 +2533,7 @@ static void rt5640_enable_hda_jack_detect(
snd_soc_component_update_bits(component, RT5640_GPIO_CTRL3,
RT5640_GP1_PF_MASK, RT5640_GP1_PF_OUT);
snd_soc_component_update_bits(component, RT5640_DUMMY1, 0x700, 0x300);
snd_soc_component_update_bits(component, RT5640_DUMMY1, 0x400, 0x0);
rt5640->jack = jack;
@ -2651,13 +2651,16 @@ static int rt5640_probe(struct snd_soc_component *component)
if (device_property_read_u32(component->dev,
"realtek,jack-detect-source", &val) == 0) {
if (val <= RT5640_JD_SRC_GPIO4)
if (val <= RT5640_JD_SRC_GPIO4) {
rt5640->jd_src = val << RT5640_JD_SFT;
else if (val == RT5640_JD_SRC_HDA_HEADER)
} else if (val == RT5640_JD_SRC_HDA_HEADER) {
rt5640->jd_src = RT5640_JD_SRC_HDA_HEADER;
else
snd_soc_component_update_bits(component, RT5640_DUMMY1,
0x0300, 0x0);
} else {
dev_warn(component->dev, "Warning: Invalid jack-detect-source value: %d, leaving jack-detect disabled\n",
val);
}
}
if (!device_property_read_bool(component->dev, "realtek,jack-detect-not-inverted"))