diff options
| author | Mark Brown <broonie@kernel.org> | 2024-03-07 15:20:35 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-03-07 15:20:35 +0000 |
| commit | 5b876c340c63e2fabce003b4fb31040517ab1e10 (patch) | |
| tree | 673adc3f3d288699d5774993cf02a56f4e98b566 /sound | |
| parent | 5d51a794414359dd387c3da7a2ea7602c67f84a6 (diff) | |
| parent | e87eecdf53228dd2b8bfeab84d409652f96a16d0 (diff) | |
| download | linux-stable-5b876c340c63e2fabce003b4fb31040517ab1e10.tar.gz linux-stable-5b876c340c63e2fabce003b4fb31040517ab1e10.tar.bz2 linux-stable-5b876c340c63e2fabce003b4fb31040517ab1e10.zip | |
ASoC: codecs: ES8326: change members of private
Merge series from Zhang Yi <zhangyi@everest-semi.com>:
We found that using 0x45 as the default value for interrupt-clk
would cause a headset detection error.So we took 0x00 as the default
value for interrupt-clk and passed the test.
We removed mic1-src and mic2-src, which were not used.
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/es8326.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/sound/soc/codecs/es8326.c b/sound/soc/codecs/es8326.c index 608862aebd71..15289dadafea 100644 --- a/sound/soc/codecs/es8326.c +++ b/sound/soc/codecs/es8326.c @@ -31,8 +31,6 @@ struct es8326_priv { * while enabling or disabling or during an irq. */ struct mutex lock; - u8 mic1_src; - u8 mic2_src; u8 jack_pol; u8 interrupt_src; u8 interrupt_clk; @@ -1092,20 +1090,6 @@ static int es8326_probe(struct snd_soc_component *component) es8326->jd_inverted = device_property_read_bool(component->dev, "everest,jack-detect-inverted"); - ret = device_property_read_u8(component->dev, "everest,mic1-src", &es8326->mic1_src); - if (ret != 0) { - dev_dbg(component->dev, "mic1-src return %d", ret); - es8326->mic1_src = ES8326_ADC_AMIC; - } - dev_dbg(component->dev, "mic1-src %x", es8326->mic1_src); - - ret = device_property_read_u8(component->dev, "everest,mic2-src", &es8326->mic2_src); - if (ret != 0) { - dev_dbg(component->dev, "mic2-src return %d", ret); - es8326->mic2_src = ES8326_ADC_DMIC; - } - dev_dbg(component->dev, "mic2-src %x", es8326->mic2_src); - ret = device_property_read_u8(component->dev, "everest,jack-pol", &es8326->jack_pol); if (ret != 0) { dev_dbg(component->dev, "jack-pol return %d", ret); @@ -1125,7 +1109,7 @@ static int es8326_probe(struct snd_soc_component *component) &es8326->interrupt_clk); if (ret != 0) { dev_dbg(component->dev, "interrupt-clk return %d", ret); - es8326->interrupt_clk = 0x45; + es8326->interrupt_clk = 0x00; } dev_dbg(component->dev, "interrupt-clk %x", es8326->interrupt_clk); |