AX88772C_eeprom and ax8872c build together

hc

2024-05-16 8d2a02b24d66aa359e83eebc1ed3c0f85367a1cb

 kernel/sound/soc/codecs/rt5616.c
..
..
@@ -1,12 +1,9 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * rt5616.c  --  RT5616 ALSA SoC audio codec driver
3
4
  *
4
5
  * Copyright 2015 Realtek Semiconductor Corp.
5
6
  * Author: Bard Liao <bardliao@realtek.com>
6
- *
7
- * This program is free software; you can redistribute it and/or modify
8
- * it under the terms of the GNU General Public License version 2 as
9
- * published by the Free Software Foundation.
10
7
  */
11
8
 
12
9
 #include <linux/module.h>
..
..
@@ -351,7 +348,7 @@
351
348
 {
352
349
 	unsigned int val;
353
350
 
354
-	val = snd_soc_component_read32(snd_soc_dapm_to_component(source->dapm), RT5616_GLB_CLK);
351
+	val = snd_soc_component_read(snd_soc_dapm_to_component(source->dapm), RT5616_GLB_CLK);
355
352
 	val &= RT5616_SCLK_SRC_MASK;
356
353
 	if (val == RT5616_SCLK_SRC_PLL1)
357
354
 		return 1;
..
..
@@ -1313,7 +1310,8 @@
1313
1310
 static const struct regmap_config rt5616_regmap = {
1314
1311
 	.reg_bits = 8,
1315
1312
 	.val_bits = 16,
1316
-	.use_single_rw = true,
1313
+	.use_single_read = true,
1314
+	.use_single_write = true,
1317
1315
 	.max_register = RT5616_DEVICE_ID + 1 + (ARRAY_SIZE(rt5616_ranges) *
1318
1316
 					       RT5616_PR_SPACING),
1319
1317
 	.volatile_reg = rt5616_volatile_register,