From 6778948f9de86c3cfaf36725a7c87dcff9ba247f Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Mon, 11 Dec 2023 08:20:59 +0000
Subject: [PATCH] kernel_5.10 no rt
---
kernel/sound/soc/codecs/rk312x_codec.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/kernel/sound/soc/codecs/rk312x_codec.c b/kernel/sound/soc/codecs/rk312x_codec.c
index 2c742dc..aba53c1 100644
--- a/kernel/sound/soc/codecs/rk312x_codec.c
+++ b/kernel/sound/soc/codecs/rk312x_codec.c
@@ -1533,7 +1533,7 @@
rk312x_codec_ctl_gpio(CODEC_SET_SPK, 1);
}
-static int rk312x_digital_mute(struct snd_soc_dai *dai, int mute)
+static int rk312x_digital_mute(struct snd_soc_dai *dai, int mute, int stream)
{
if (mute) {
@@ -1921,9 +1921,10 @@
.hw_params = rk312x_hw_params,
.set_fmt = rk312x_set_dai_fmt,
.set_sysclk = rk312x_set_dai_sysclk,
- .digital_mute = rk312x_digital_mute,
+ .mute_stream = rk312x_digital_mute,
.startup = rk312x_startup,
.shutdown = rk312x_shutdown,
+ .no_capture_mute = 1,
};
static struct snd_soc_dai_driver rk312x_dai[] = {
@@ -2066,7 +2067,7 @@
if (rk312x_priv->codec_hp_det) {
/* enable hp det interrupt */
snd_soc_component_write(component, RK312x_DAC_CTL, 0x08);
- snd_soc_component_read(component, RK312x_DAC_CTL, &val);
+ val = snd_soc_component_read(component, RK312x_DAC_CTL);
printk("0xa0 -- 0x%x\n", val);
regmap_read(rk312x_priv->grf, GRF_ACODEC_CON, &val);
regmap_write(rk312x_priv->grf, GRF_ACODEC_CON, 0x1f001f);
@@ -2155,7 +2156,7 @@
DBG("GRF_ACODEC_CON 3334is 0x%x\n", val);
/* enable rk 3128 codec_hp_det */
snd_soc_component_write(component, RK312x_DAC_CTL, 0x08);
- snd_soc_component_read(component, RK312x_DAC_CTL, &val);
+ val = snd_soc_component_read(component, RK312x_DAC_CTL);
DBG("0xa0 -- 0x%x\n", val);
/* codec hp det once */
schedule_delayed_work(&rk312x_priv->hpdet_work, msecs_to_jiffies(100));
@@ -2186,7 +2187,7 @@
goto err__;
}
- snd_soc_component_read(component, RK312x_RESET, &val);
+ val = snd_soc_component_read(component, RK312x_RESET);
if (val != rk312x_reg_defaults[RK312x_RESET]) {
DBG("%s : codec register 0: %x is not a 0x00000003\n",
--
Gitblit v1.6.2