hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/sound/soc/codecs/rk312x_codec.c
....@@ -1533,7 +1533,7 @@
15331533 rk312x_codec_ctl_gpio(CODEC_SET_SPK, 1);
15341534 }
15351535
1536
-static int rk312x_digital_mute(struct snd_soc_dai *dai, int mute)
1536
+static int rk312x_digital_mute(struct snd_soc_dai *dai, int mute, int stream)
15371537 {
15381538
15391539 if (mute) {
....@@ -1921,9 +1921,10 @@
19211921 .hw_params = rk312x_hw_params,
19221922 .set_fmt = rk312x_set_dai_fmt,
19231923 .set_sysclk = rk312x_set_dai_sysclk,
1924
- .digital_mute = rk312x_digital_mute,
1924
+ .mute_stream = rk312x_digital_mute,
19251925 .startup = rk312x_startup,
19261926 .shutdown = rk312x_shutdown,
1927
+ .no_capture_mute = 1,
19271928 };
19281929
19291930 static struct snd_soc_dai_driver rk312x_dai[] = {
....@@ -2066,7 +2067,7 @@
20662067 if (rk312x_priv->codec_hp_det) {
20672068 /* enable hp det interrupt */
20682069 snd_soc_component_write(component, RK312x_DAC_CTL, 0x08);
2069
- snd_soc_component_read(component, RK312x_DAC_CTL, &val);
2070
+ val = snd_soc_component_read(component, RK312x_DAC_CTL);
20702071 printk("0xa0 -- 0x%x\n", val);
20712072 regmap_read(rk312x_priv->grf, GRF_ACODEC_CON, &val);
20722073 regmap_write(rk312x_priv->grf, GRF_ACODEC_CON, 0x1f001f);
....@@ -2155,7 +2156,7 @@
21552156 DBG("GRF_ACODEC_CON 3334is 0x%x\n", val);
21562157 /* enable rk 3128 codec_hp_det */
21572158 snd_soc_component_write(component, RK312x_DAC_CTL, 0x08);
2158
- snd_soc_component_read(component, RK312x_DAC_CTL, &val);
2159
+ val = snd_soc_component_read(component, RK312x_DAC_CTL);
21592160 DBG("0xa0 -- 0x%x\n", val);
21602161 /* codec hp det once */
21612162 schedule_delayed_work(&rk312x_priv->hpdet_work, msecs_to_jiffies(100));
....@@ -2186,7 +2187,7 @@
21862187 goto err__;
21872188 }
21882189
2189
- snd_soc_component_read(component, RK312x_RESET, &val);
2190
+ val = snd_soc_component_read(component, RK312x_RESET);
21902191
21912192 if (val != rk312x_reg_defaults[RK312x_RESET]) {
21922193 DBG("%s : codec register 0: %x is not a 0x00000003\n",