Skip to content

Commit 5b876c3

Browse files
committed
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.
2 parents 5d51a79 + e87eecd commit 5b876c3

File tree

2 files changed

+5
-21
lines changed

2 files changed

+5
-21
lines changed

Documentation/devicetree/bindings/sound/everest,es8326.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ properties:
3838
default: 0x0f
3939

4040
everest,mic1-src:
41+
deprecated: true
4142
$ref: /schemas/types.yaml#/definitions/uint8
4243
description:
4344
the value of reg 2A when headset plugged.
@@ -46,6 +47,7 @@ properties:
4647
default: 0x22
4748

4849
everest,mic2-src:
50+
deprecated: true
4951
$ref: /schemas/types.yaml#/definitions/uint8
5052
description:
5153
the value of reg 2A when headset unplugged.
@@ -87,7 +89,7 @@ properties:
8789
0 means the chip detect jack type again after button released.
8890
minimum: 0
8991
maximum: 0x7f
90-
default: 0x45
92+
default: 0x00
9193

9294
required:
9395
- compatible
@@ -107,10 +109,8 @@ examples:
107109
clocks = <&clks 10>;
108110
clock-names = "mclk";
109111
#sound-dai-cells = <0>;
110-
everest,mic1-src = [22];
111-
everest,mic2-src = [44];
112112
everest,jack-pol = [0e];
113113
everest,interrupt-src = [08];
114-
everest,interrupt-clk = [45];
114+
everest,interrupt-clk = [00];
115115
};
116116
};

sound/soc/codecs/es8326.c

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ struct es8326_priv {
3131
* while enabling or disabling or during an irq.
3232
*/
3333
struct mutex lock;
34-
u8 mic1_src;
35-
u8 mic2_src;
3634
u8 jack_pol;
3735
u8 interrupt_src;
3836
u8 interrupt_clk;
@@ -1092,20 +1090,6 @@ static int es8326_probe(struct snd_soc_component *component)
10921090
es8326->jd_inverted = device_property_read_bool(component->dev,
10931091
"everest,jack-detect-inverted");
10941092

1095-
ret = device_property_read_u8(component->dev, "everest,mic1-src", &es8326->mic1_src);
1096-
if (ret != 0) {
1097-
dev_dbg(component->dev, "mic1-src return %d", ret);
1098-
es8326->mic1_src = ES8326_ADC_AMIC;
1099-
}
1100-
dev_dbg(component->dev, "mic1-src %x", es8326->mic1_src);
1101-
1102-
ret = device_property_read_u8(component->dev, "everest,mic2-src", &es8326->mic2_src);
1103-
if (ret != 0) {
1104-
dev_dbg(component->dev, "mic2-src return %d", ret);
1105-
es8326->mic2_src = ES8326_ADC_DMIC;
1106-
}
1107-
dev_dbg(component->dev, "mic2-src %x", es8326->mic2_src);
1108-
11091093
ret = device_property_read_u8(component->dev, "everest,jack-pol", &es8326->jack_pol);
11101094
if (ret != 0) {
11111095
dev_dbg(component->dev, "jack-pol return %d", ret);
@@ -1125,7 +1109,7 @@ static int es8326_probe(struct snd_soc_component *component)
11251109
&es8326->interrupt_clk);
11261110
if (ret != 0) {
11271111
dev_dbg(component->dev, "interrupt-clk return %d", ret);
1128-
es8326->interrupt_clk = 0x45;
1112+
es8326->interrupt_clk = 0x00;
11291113
}
11301114
dev_dbg(component->dev, "interrupt-clk %x", es8326->interrupt_clk);
11311115

0 commit comments

Comments
 (0)