add audio

hc

2023-12-11 1f93a7dfd1f8d5ff7a5c53246c7534fe2332d6f4

 kernel/sound/soc/sirf/sirf-audio.c
..
..
@@ -1,9 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * SiRF audio card driver
3
4
  *
4
5
  * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company.
5
- *
6
- * Licensed under GPLv2 or later.
7
6
  */
8
7
 
9
8
 #include <linux/platform_device.h>
..
..
@@ -61,11 +60,16 @@
61
60
 };
62
61
 
63
62
 /* Digital audio interface glue - connects codec <--> CPU */
63
+SND_SOC_DAILINK_DEFS(sirf,
64
+	DAILINK_COMP_ARRAY(COMP_EMPTY()),
65
+	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "sirf-audio-codec")),
66
+	DAILINK_COMP_ARRAY(COMP_EMPTY()));
67
+
64
68
 static struct snd_soc_dai_link sirf_audio_dai_link[] = {
65
69
 	{
66
70
 		.name = "SiRF audio card",
67
71
 		.stream_name = "SiRF audio HiFi",
68
-		.codec_dai_name = "sirf-audio-codec",
72
+		SND_SOC_DAILINK_REG(sirf),
69
73
 	},
70
74
 };
71
75
 
..
..
@@ -92,11 +96,11 @@
92
96
 	if (sirf_audio_card == NULL)
93
97
 		return -ENOMEM;
94
98
 
95
-	sirf_audio_dai_link[0].cpu_of_node =
99
+	sirf_audio_dai_link[0].cpus->of_node =
96
100
 		of_parse_phandle(pdev->dev.of_node, "sirf,audio-platform", 0);
97
-	sirf_audio_dai_link[0].platform_of_node =
101
+	sirf_audio_dai_link[0].platforms->of_node =
98
102
 		of_parse_phandle(pdev->dev.of_node, "sirf,audio-platform", 0);
99
-	sirf_audio_dai_link[0].codec_of_node =
103
+	sirf_audio_dai_link[0].codecs->of_node =
100
104
 		of_parse_phandle(pdev->dev.of_node, "sirf,audio-codec", 0);
101
105
 	sirf_audio_card->gpio_spk_pa = of_get_named_gpio(pdev->dev.of_node,
102
106
 			"spk-pa-gpios", 0);