.. | .. |
---|
| 1 | +// SPDX-License-Identifier: GPL-2.0-only |
---|
1 | 2 | /* |
---|
2 | 3 | * DB1200/DB1300/DB1550 ASoC audio fabric support code. |
---|
3 | 4 | * |
---|
.. | .. |
---|
46 | 47 | |
---|
47 | 48 | /*------------------------- AC97 PART ---------------------------*/ |
---|
48 | 49 | |
---|
| 50 | +SND_SOC_DAILINK_DEFS(db1200_ac97, |
---|
| 51 | + DAILINK_COMP_ARRAY(COMP_CPU("au1xpsc_ac97.1")), |
---|
| 52 | + DAILINK_COMP_ARRAY(COMP_CODEC("ac97-codec.1", "ac97-hifi")), |
---|
| 53 | + DAILINK_COMP_ARRAY(COMP_PLATFORM("au1xpsc-pcm.1"))); |
---|
| 54 | + |
---|
49 | 55 | static struct snd_soc_dai_link db1200_ac97_dai = { |
---|
50 | 56 | .name = "AC97", |
---|
51 | 57 | .stream_name = "AC97 HiFi", |
---|
52 | | - .codec_dai_name = "ac97-hifi", |
---|
53 | | - .cpu_dai_name = "au1xpsc_ac97.1", |
---|
54 | | - .platform_name = "au1xpsc-pcm.1", |
---|
55 | | - .codec_name = "ac97-codec.1", |
---|
| 58 | + SND_SOC_DAILINK_REG(db1200_ac97), |
---|
56 | 59 | }; |
---|
57 | 60 | |
---|
58 | 61 | static struct snd_soc_card db1200_ac97_machine = { |
---|
.. | .. |
---|
62 | 65 | .num_links = 1, |
---|
63 | 66 | }; |
---|
64 | 67 | |
---|
| 68 | +SND_SOC_DAILINK_DEFS(db1300_ac97, |
---|
| 69 | + DAILINK_COMP_ARRAY(COMP_CPU("au1xpsc_ac97.1")), |
---|
| 70 | + DAILINK_COMP_ARRAY(COMP_CODEC("wm9712-codec.1", "wm9712-hifi")), |
---|
| 71 | + DAILINK_COMP_ARRAY(COMP_PLATFORM("au1xpsc-pcm.1"))); |
---|
| 72 | + |
---|
65 | 73 | static struct snd_soc_dai_link db1300_ac97_dai = { |
---|
66 | 74 | .name = "AC97", |
---|
67 | 75 | .stream_name = "AC97 HiFi", |
---|
68 | | - .codec_dai_name = "wm9712-hifi", |
---|
69 | | - .cpu_dai_name = "au1xpsc_ac97.1", |
---|
70 | | - .platform_name = "au1xpsc-pcm.1", |
---|
71 | | - .codec_name = "wm9712-codec.1", |
---|
| 76 | + SND_SOC_DAILINK_REG(db1300_ac97), |
---|
72 | 77 | }; |
---|
73 | 78 | |
---|
74 | 79 | static struct snd_soc_card db1300_ac97_machine = { |
---|
.. | .. |
---|
89 | 94 | |
---|
90 | 95 | static int db1200_i2s_startup(struct snd_pcm_substream *substream) |
---|
91 | 96 | { |
---|
92 | | - struct snd_soc_pcm_runtime *rtd = substream->private_data; |
---|
93 | | - struct snd_soc_dai *codec_dai = rtd->codec_dai; |
---|
| 97 | + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); |
---|
| 98 | + struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); |
---|
94 | 99 | |
---|
95 | 100 | /* WM8731 has its own 12MHz crystal */ |
---|
96 | 101 | snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL, |
---|
.. | .. |
---|
103 | 108 | .startup = db1200_i2s_startup, |
---|
104 | 109 | }; |
---|
105 | 110 | |
---|
| 111 | +SND_SOC_DAILINK_DEFS(db1200_i2s, |
---|
| 112 | + DAILINK_COMP_ARRAY(COMP_CPU("au1xpsc_i2s.1")), |
---|
| 113 | + DAILINK_COMP_ARRAY(COMP_CODEC("wm8731.0-001b", "wm8731-hifi")), |
---|
| 114 | + DAILINK_COMP_ARRAY(COMP_PLATFORM("au1xpsc-pcm.1"))); |
---|
| 115 | + |
---|
106 | 116 | static struct snd_soc_dai_link db1200_i2s_dai = { |
---|
107 | 117 | .name = "WM8731", |
---|
108 | 118 | .stream_name = "WM8731 PCM", |
---|
109 | | - .codec_dai_name = "wm8731-hifi", |
---|
110 | | - .cpu_dai_name = "au1xpsc_i2s.1", |
---|
111 | | - .platform_name = "au1xpsc-pcm.1", |
---|
112 | | - .codec_name = "wm8731.0-001b", |
---|
113 | 119 | .dai_fmt = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_NB_NF | |
---|
114 | 120 | SND_SOC_DAIFMT_CBM_CFM, |
---|
115 | 121 | .ops = &db1200_i2s_wm8731_ops, |
---|
| 122 | + SND_SOC_DAILINK_REG(db1200_i2s), |
---|
116 | 123 | }; |
---|
117 | 124 | |
---|
118 | 125 | static struct snd_soc_card db1200_i2s_machine = { |
---|
.. | .. |
---|
122 | 129 | .num_links = 1, |
---|
123 | 130 | }; |
---|
124 | 131 | |
---|
| 132 | +SND_SOC_DAILINK_DEFS(db1300_i2s, |
---|
| 133 | + DAILINK_COMP_ARRAY(COMP_CPU("au1xpsc_i2s.2")), |
---|
| 134 | + DAILINK_COMP_ARRAY(COMP_CODEC("wm8731.0-001b", "wm8731-hifi")), |
---|
| 135 | + DAILINK_COMP_ARRAY(COMP_PLATFORM("au1xpsc-pcm.2"))); |
---|
| 136 | + |
---|
125 | 137 | static struct snd_soc_dai_link db1300_i2s_dai = { |
---|
126 | 138 | .name = "WM8731", |
---|
127 | 139 | .stream_name = "WM8731 PCM", |
---|
128 | | - .codec_dai_name = "wm8731-hifi", |
---|
129 | | - .cpu_dai_name = "au1xpsc_i2s.2", |
---|
130 | | - .platform_name = "au1xpsc-pcm.2", |
---|
131 | | - .codec_name = "wm8731.0-001b", |
---|
132 | 140 | .dai_fmt = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_NB_NF | |
---|
133 | 141 | SND_SOC_DAIFMT_CBM_CFM, |
---|
134 | 142 | .ops = &db1200_i2s_wm8731_ops, |
---|
| 143 | + SND_SOC_DAILINK_REG(db1300_i2s), |
---|
135 | 144 | }; |
---|
136 | 145 | |
---|
137 | 146 | static struct snd_soc_card db1300_i2s_machine = { |
---|
.. | .. |
---|
141 | 150 | .num_links = 1, |
---|
142 | 151 | }; |
---|
143 | 152 | |
---|
| 153 | +SND_SOC_DAILINK_DEFS(db1550_i2s, |
---|
| 154 | + DAILINK_COMP_ARRAY(COMP_CPU("au1xpsc_i2s.3")), |
---|
| 155 | + DAILINK_COMP_ARRAY(COMP_CODEC("wm8731.0-001b", "wm8731-hifi")), |
---|
| 156 | + DAILINK_COMP_ARRAY(COMP_PLATFORM("au1xpsc-pcm.3"))); |
---|
| 157 | + |
---|
144 | 158 | static struct snd_soc_dai_link db1550_i2s_dai = { |
---|
145 | 159 | .name = "WM8731", |
---|
146 | 160 | .stream_name = "WM8731 PCM", |
---|
147 | | - .codec_dai_name = "wm8731-hifi", |
---|
148 | | - .cpu_dai_name = "au1xpsc_i2s.3", |
---|
149 | | - .platform_name = "au1xpsc-pcm.3", |
---|
150 | | - .codec_name = "wm8731.0-001b", |
---|
151 | 161 | .dai_fmt = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_NB_NF | |
---|
152 | 162 | SND_SOC_DAIFMT_CBM_CFM, |
---|
153 | 163 | .ops = &db1200_i2s_wm8731_ops, |
---|
| 164 | + SND_SOC_DAILINK_REG(db1550_i2s), |
---|
154 | 165 | }; |
---|
155 | 166 | |
---|
156 | 167 | static struct snd_soc_card db1550_i2s_machine = { |
---|