add stmac read mac form eeprom

hc

2023-12-09 b22da3d8526a935aa31e086e63f60ff3246cb61c

 kernel/sound/soc/kirkwood/armada-370-db.c
..
..
@@ -1,12 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * Copyright (C) 2014 Marvell
3
4
  *
4
5
  * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
5
- *
6
- * This program is free software; you can redistribute it and/or
7
- * modify it under the terms of the GNU General Public License as
8
- * published by the Free Software Foundation; either version 2 of the
9
- * License, or (at your option) any later version.
10
6
  */
11
7
 
12
8
 #include <linux/module.h>
..
..
@@ -22,8 +18,8 @@
22
18
 static int a370db_hw_params(struct snd_pcm_substream *substream,
23
19
 			    struct snd_pcm_hw_params *params)
24
20
 {
25
-	struct snd_soc_pcm_runtime *rtd = substream->private_data;
26
-	struct snd_soc_dai *codec_dai = rtd->codec_dai;
21
+	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
22
+	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
27
23
 	unsigned int freq;
28
24
 
29
25
 	switch (params_rate(params)) {
..
..
@@ -58,28 +54,40 @@
58
54
 	{ "AIN1L",	NULL,	"In Jack" },
59
55
 };
60
56
 
57
+SND_SOC_DAILINK_DEFS(analog,
58
+	DAILINK_COMP_ARRAY(COMP_CPU("i2s")),
59
+	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "cs42l51-hifi")),
60
+	DAILINK_COMP_ARRAY(COMP_EMPTY()));
61
+
62
+SND_SOC_DAILINK_DEFS(spdif_out,
63
+	DAILINK_COMP_ARRAY(COMP_CPU("spdif")),
64
+	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "dit-hifi")),
65
+	DAILINK_COMP_ARRAY(COMP_EMPTY()));
66
+
67
+SND_SOC_DAILINK_DEFS(spdif_in,
68
+	DAILINK_COMP_ARRAY(COMP_CPU("spdif")),
69
+	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "dir-hifi")),
70
+	DAILINK_COMP_ARRAY(COMP_EMPTY()));
71
+
61
72
 static struct snd_soc_dai_link a370db_dai[] = {
62
73
 {
63
74
 	.name = "CS42L51",
64
75
 	.stream_name = "analog",
65
-	.cpu_dai_name = "i2s",
66
-	.codec_dai_name = "cs42l51-hifi",
67
76
 	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,
68
77
 	.ops = &a370db_ops,
78
+	SND_SOC_DAILINK_REG(analog),
69
79
 },
70
80
 {
71
81
 	.name = "S/PDIF out",
72
82
 	.stream_name = "spdif-out",
73
-	.cpu_dai_name = "spdif",
74
-	.codec_dai_name = "dit-hifi",
75
83
 	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,
84
+	SND_SOC_DAILINK_REG(spdif_out),
76
85
 },
77
86
 {
78
87
 	.name = "S/PDIF in",
79
88
 	.stream_name = "spdif-in",
80
-	.cpu_dai_name = "spdif",
81
-	.codec_dai_name = "dir-hifi",
82
89
 	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,
90
+	SND_SOC_DAILINK_REG(spdif_in),
83
91
 },
84
92
 };
85
93
 
..
..
@@ -100,26 +108,26 @@
100
108
 
101
109
 	card->dev = &pdev->dev;
102
110
 
103
-	a370db_dai[0].cpu_of_node =
111
+	a370db_dai[0].cpus->of_node =
104
112
 		of_parse_phandle(pdev->dev.of_node,
105
113
 				 "marvell,audio-controller", 0);
106
-	a370db_dai[0].platform_of_node = a370db_dai[0].cpu_of_node;
114
+	a370db_dai[0].platforms->of_node = a370db_dai[0].cpus->of_node;
107
115
 
108
-	a370db_dai[0].codec_of_node =
116
+	a370db_dai[0].codecs->of_node =
109
117
 		of_parse_phandle(pdev->dev.of_node,
110
118
 				 "marvell,audio-codec", 0);
111
119
 
112
-	a370db_dai[1].cpu_of_node = a370db_dai[0].cpu_of_node;
113
-	a370db_dai[1].platform_of_node = a370db_dai[0].cpu_of_node;
120
+	a370db_dai[1].cpus->of_node = a370db_dai[0].cpus->of_node;
121
+	a370db_dai[1].platforms->of_node = a370db_dai[0].cpus->of_node;
114
122
 
115
-	a370db_dai[1].codec_of_node =
123
+	a370db_dai[1].codecs->of_node =
116
124
 		of_parse_phandle(pdev->dev.of_node,
117
125
 				 "marvell,audio-codec", 1);
118
126
 
119
-	a370db_dai[2].cpu_of_node = a370db_dai[0].cpu_of_node;
120
-	a370db_dai[2].platform_of_node = a370db_dai[0].cpu_of_node;
127
+	a370db_dai[2].cpus->of_node = a370db_dai[0].cpus->of_node;
128
+	a370db_dai[2].platforms->of_node = a370db_dai[0].cpus->of_node;
121
129
 
122
-	a370db_dai[2].codec_of_node =
130
+	a370db_dai[2].codecs->of_node =
123
131
 		of_parse_phandle(pdev->dev.of_node,
124
132
 				 "marvell,audio-codec", 2);
125
133