gmac get mac form eeprom

hc

2024-05-10 37f49e37ab4cb5d0bc4c60eb5c6d4dd57db767bb

 kernel/sound/soc/codecs/rk312x_codec.c
..
..
@@ -1533,7 +1533,7 @@
1533
1533
 	rk312x_codec_ctl_gpio(CODEC_SET_SPK, 1);
1534
1534
 }
1535
1535
 
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)
1537
1537
 {
1538
1538
 
1539
1539
 	if (mute) {
..
..
@@ -1921,9 +1921,10 @@
1921
1921
 	.hw_params	= rk312x_hw_params,
1922
1922
 	.set_fmt	= rk312x_set_dai_fmt,
1923
1923
 	.set_sysclk	= rk312x_set_dai_sysclk,
1924
-	.digital_mute	= rk312x_digital_mute,
1924
+	.mute_stream	= rk312x_digital_mute,
1925
1925
 	.startup	= rk312x_startup,
1926
1926
 	.shutdown	= rk312x_shutdown,
1927
+	.no_capture_mute = 1,
1927
1928
 };
1928
1929
 
1929
1930
 static struct snd_soc_dai_driver rk312x_dai[] = {
..
..
@@ -2066,7 +2067,7 @@
2066
2067
 	if (rk312x_priv->codec_hp_det) {
2067
2068
 		/* enable hp det interrupt */
2068
2069
 		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);
2070
2071
 		printk("0xa0 -- 0x%x\n", val);
2071
2072
 		regmap_read(rk312x_priv->grf, GRF_ACODEC_CON, &val);
2072
2073
 		regmap_write(rk312x_priv->grf, GRF_ACODEC_CON, 0x1f001f);
..
..
@@ -2155,7 +2156,7 @@
2155
2156
 		DBG("GRF_ACODEC_CON 3334is 0x%x\n", val);
2156
2157
 		/* enable rk 3128 codec_hp_det */
2157
2158
 		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);
2159
2160
 		DBG("0xa0 -- 0x%x\n", val);
2160
2161
 		/* codec hp det once */
2161
2162
 		schedule_delayed_work(&rk312x_priv->hpdet_work, msecs_to_jiffies(100));
..
..
@@ -2186,7 +2187,7 @@
2186
2187
 		goto err__;
2187
2188
 	}
2188
2189
 
2189
-	snd_soc_component_read(component, RK312x_RESET, &val);
2190
+	val = snd_soc_component_read(component, RK312x_RESET);
2190
2191
 
2191
2192
 	if (val != rk312x_reg_defaults[RK312x_RESET]) {
2192
2193
 		DBG("%s : codec register 0: %x is not a 0x00000003\n",