kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c
..
..
@@ -1,17 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
- * soc-apci-intel-hsw-bdw-match.c - tables and support for ACPI enumeration.
3
+ * soc-acpi-intel-hsw-bdw-match.c - tables and support for ACPI enumeration.
3
4
  *
4
5
  * Copyright (c) 2017, Intel Corporation.
5
- *
6
- *
7
- * This program is free software; you can redistribute it and/or modify it
8
- * under the terms and conditions of the GNU General Public License,
9
- * version 2, as published by the Free Software Foundation.
10
- *
11
- * This program is distributed in the hope it will be useful, but WITHOUT
12
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
14
- * more details.
15
6
  */
16
7
 
17
8
 #include <linux/dmi.h>
..
..
@@ -23,9 +14,8 @@
23
14
 		.id = "INT33CA",
24
15
 		.drv_name = "haswell-audio",
25
16
 		.fw_filename = "intel/IntcSST1.bin",
26
-		.sof_fw_filename = "intel/sof-hsw.ri",
27
-		.sof_tplg_filename = "intel/sof-hsw.tplg",
28
-		.asoc_plat_name = "haswell-pcm-audio",
17
+		.sof_fw_filename = "sof-hsw.ri",
18
+		.sof_tplg_filename = "sof-hsw.tplg",
29
19
 	},
30
20
 	{}
31
21
 };
..
..
@@ -36,25 +26,29 @@
36
26
 		.id = "INT343A",
37
27
 		.drv_name = "broadwell-audio",
38
28
 		.fw_filename =  "intel/IntcSST2.bin",
39
-		.sof_fw_filename = "intel/sof-bdw.ri",
40
-		.sof_tplg_filename = "intel/sof-bdw-rt286.tplg",
41
-		.asoc_plat_name = "haswell-pcm-audio",
29
+		.sof_fw_filename = "sof-bdw.ri",
30
+		.sof_tplg_filename = "sof-bdw-rt286.tplg",
31
+	},
32
+	{
33
+		.id = "10EC5650",
34
+		.drv_name = "bdw-rt5650",
35
+		.fw_filename = "intel/IntcSST2.bin",
36
+		.sof_fw_filename = "sof-bdw.ri",
37
+		.sof_tplg_filename = "sof-bdw-rt5650.tplg",
42
38
 	},
43
39
 	{
44
40
 		.id = "RT5677CE",
45
41
 		.drv_name = "bdw-rt5677",
46
42
 		.fw_filename =  "intel/IntcSST2.bin",
47
-		.sof_fw_filename = "intel/sof-bdw.ri",
48
-		.sof_tplg_filename = "intel/sof-bdw-rt5677.tplg",
49
-		.asoc_plat_name = "haswell-pcm-audio",
43
+		.sof_fw_filename = "sof-bdw.ri",
44
+		.sof_tplg_filename = "sof-bdw-rt5677.tplg",
50
45
 	},
51
46
 	{
52
47
 		.id = "INT33CA",
53
48
 		.drv_name = "haswell-audio",
54
49
 		.fw_filename = "intel/IntcSST2.bin",
55
-		.sof_fw_filename = "intel/sof-bdw.ri",
56
-		.sof_tplg_filename = "intel/sof-bdw-rt5640.tplg",
57
-		.asoc_plat_name = "haswell-pcm-audio",
50
+		.sof_fw_filename = "sof-bdw.ri",
51
+		.sof_tplg_filename = "sof-bdw-rt5640.tplg",
58
52
 	},
59
53
 	{}
60
54
 };