Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-22 07:53:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: rt5663: Seprate the DC offset between headphone and headset

Browse Source 
The patch seprates the DC offset between headphone and headset.

Signed-off-by: Oder Chiou <oder_chiou@realtek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
oder_chiou@realtek.com 2017-08-02 16:01:27 +08:00 committed by Mark Brown
parent c1bbaff6d7
commit 278982b50b
3 changed files with 44 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/devicetree/bindings/sound/rt5663.txt
View File

@ -14,8 +14,11 @@ Optional properties:
- "realtek,dc_offset_l_manual"
- "realtek,dc_offset_r_manual"
- "realtek,dc_offset_l_manual_mic"
- "realtek,dc_offset_r_manual_mic"
Based on the different PCB layout, add the manual offset value to
compensate the DC offset for each L and R channel.
compensate the DC offset for each L and R channel, and they are different
between headphone and headset.
Pins on the device (for linking into audio routes) for RT5663:

2
include/sound/rt5663.h
View File

@ -14,6 +14,8 @@
struct rt5663_platform_data {
unsigned int dc_offset_l_manual;
unsigned int dc_offset_r_manual;
unsigned int dc_offset_l_manual_mic;
unsigned int dc_offset_r_manual_mic;
};
#endif

52
sound/soc/codecs/rt5663.c
View File

@ -1570,9 +1570,43 @@ static int rt5663_jack_detect(struct snd_soc_codec *codec, int jack_insert)
case 2:
rt5663->jack_type = SND_JACK_HEADSET;
rt5663_enable_push_button_irq(codec, true);
if (rt5663->pdata.dc_offset_l_manual_mic) {
regmap_write(rt5663->regmap, RT5663_MIC_DECRO_2,
rt5663->pdata.dc_offset_l_manual_mic >>
16);
regmap_write(rt5663->regmap, RT5663_MIC_DECRO_3,
rt5663->pdata.dc_offset_l_manual_mic &
0xffff);
}
if (rt5663->pdata.dc_offset_r_manual_mic) {
regmap_write(rt5663->regmap, RT5663_MIC_DECRO_5,
rt5663->pdata.dc_offset_r_manual_mic >>
16);
regmap_write(rt5663->regmap, RT5663_MIC_DECRO_6,
rt5663->pdata.dc_offset_r_manual_mic &
0xffff);
}
break;
default:
rt5663->jack_type = SND_JACK_HEADPHONE;
if (rt5663->pdata.dc_offset_l_manual) {
regmap_write(rt5663->regmap, RT5663_MIC_DECRO_2,
rt5663->pdata.dc_offset_l_manual >> 16);
regmap_write(rt5663->regmap, RT5663_MIC_DECRO_3,
rt5663->pdata.dc_offset_l_manual &
0xffff);
}
if (rt5663->pdata.dc_offset_r_manual) {
regmap_write(rt5663->regmap, RT5663_MIC_DECRO_5,
rt5663->pdata.dc_offset_r_manual >> 16);
regmap_write(rt5663->regmap, RT5663_MIC_DECRO_6,
rt5663->pdata.dc_offset_r_manual &
0xffff);
}
break;
}
} else {
@ -3133,6 +3167,10 @@ static int rt5663_parse_dp(struct rt5663_priv *rt5663, struct device *dev)
&rt5663->pdata.dc_offset_l_manual);
device_property_read_u32(dev, "realtek,dc_offset_r_manual",
&rt5663->pdata.dc_offset_r_manual);
device_property_read_u32(dev, "realtek,dc_offset_l_manual_mic",
&rt5663->pdata.dc_offset_l_manual_mic);
device_property_read_u32(dev, "realtek,dc_offset_r_manual_mic",
&rt5663->pdata.dc_offset_r_manual_mic);
return 0;
}
@ -3221,20 +3259,6 @@ static int rt5663_i2c_probe(struct i2c_client *i2c,
dev_err(&i2c->dev, "%s:Unknown codec type\n", __func__);
}
if (rt5663->pdata.dc_offset_l_manual) {
regmap_write(rt5663->regmap, RT5663_MIC_DECRO_2,
rt5663->pdata.dc_offset_l_manual >> 16);
regmap_write(rt5663->regmap, RT5663_MIC_DECRO_3,
rt5663->pdata.dc_offset_l_manual & 0xffff);
}
if (rt5663->pdata.dc_offset_r_manual) {
regmap_write(rt5663->regmap, RT5663_MIC_DECRO_5,
rt5663->pdata.dc_offset_r_manual >> 16);
regmap_write(rt5663->regmap, RT5663_MIC_DECRO_6,
rt5663->pdata.dc_offset_r_manual & 0xffff);
}
/* GPIO1 as IRQ */
regmap_update_bits(rt5663->regmap, RT5663_GPIO_1, RT5663_GP1_PIN_MASK,
RT5663_GP1_PIN_IRQ);