移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/sound/soc/codecs/rt5660.c
..
..
@@ -1,12 +1,9 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * rt5660.c  --  RT5660 ALSA SoC audio codec driver
3
4
  *
4
5
  * Copyright 2016 Realtek Semiconductor Corp.
5
6
  * Author: Oder Chiou <oder_chiou@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>
..
..
@@ -376,7 +373,7 @@
376
373
 	struct snd_soc_component *component = snd_soc_dapm_to_component(source->dapm);
377
374
 	unsigned int val;
378
375
 
379
-	val = snd_soc_component_read32(component, RT5660_GLB_CLK);
376
+	val = snd_soc_component_read(component, RT5660_GLB_CLK);
380
377
 	val &= RT5660_SCLK_SRC_MASK;
381
378
 	if (val == RT5660_SCLK_SRC_PLL1)
382
379
 		return 1;
..
..
@@ -1217,7 +1214,8 @@
1217
1214
 static const struct regmap_config rt5660_regmap = {
1218
1215
 	.reg_bits = 8,
1219
1216
 	.val_bits = 16,
1220
-	.use_single_rw = true,
1217
+	.use_single_read = true,
1218
+	.use_single_write = true,
1221
1219
 
1222
1220
 	.max_register = RT5660_VENDOR_ID2 + 1 + (ARRAY_SIZE(rt5660_ranges) *
1223
1221
 					       RT5660_PR_SPACING),
..
..
@@ -1243,11 +1241,14 @@
1243
1241
 };
1244
1242
 MODULE_DEVICE_TABLE(of, rt5660_of_match);
1245
1243
 
1244
+#ifdef CONFIG_ACPI
1246
1245
 static const struct acpi_device_id rt5660_acpi_match[] = {
1247
1246
 	{ "10EC5660", 0 },
1247
+	{ "10EC3277", 0 },
1248
1248
 	{ },
1249
1249
 };
1250
1250
 MODULE_DEVICE_TABLE(acpi, rt5660_acpi_match);
1251
+#endif
1251
1252
 
1252
1253
 static int rt5660_parse_dt(struct rt5660_priv *rt5660, struct device *dev)
1253
1254
 {