aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/pxa')
-rw-r--r--sound/soc/pxa/Kconfig12
-rw-r--r--sound/soc/pxa/Makefile2
-rw-r--r--sound/soc/pxa/magician.c2
-rw-r--r--sound/soc/pxa/pxa-ssp.c141
-rw-r--r--sound/soc/pxa/pxa2xx-ac97.c17
-rw-r--r--sound/soc/pxa/pxa2xx-i2s.c7
-rw-r--r--sound/soc/pxa/pxa2xx-pcm.c4
-rw-r--r--sound/soc/pxa/raumfeld.c354
-rw-r--r--sound/soc/pxa/zylonite.c5
9 files changed, 479 insertions, 65 deletions
diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig
index dcb3181bb340..376e14a9c273 100644
--- a/sound/soc/pxa/Kconfig
+++ b/sound/soc/pxa/Kconfig
@@ -90,7 +90,8 @@ config SND_PXA2XX_SOC_E800
90 90
91config SND_PXA2XX_SOC_EM_X270 91config SND_PXA2XX_SOC_EM_X270
92 tristate "SoC Audio support for CompuLab EM-x270, eXeda and CM-X300" 92 tristate "SoC Audio support for CompuLab EM-x270, eXeda and CM-X300"
93 depends on SND_PXA2XX_SOC && MACH_EM_X270 93 depends on SND_PXA2XX_SOC && (MACH_EM_X270 || MACH_EXEDA || \
94 MACH_CM_X300)
94 select SND_PXA2XX_SOC_AC97 95 select SND_PXA2XX_SOC_AC97
95 select SND_SOC_WM9712 96 select SND_SOC_WM9712
96 help 97 help
@@ -117,6 +118,15 @@ config SND_SOC_ZYLONITE
117 Say Y if you want to add support for SoC audio on the 118 Say Y if you want to add support for SoC audio on the
118 Marvell Zylonite reference platform. 119 Marvell Zylonite reference platform.
119 120
121config SND_SOC_RAUMFELD
122 tristate "SoC Audio support Raumfeld audio adapter"
123 depends on SND_PXA2XX_SOC && (MACH_RAUMFELD_SPEAKER || MACH_RAUMFELD_CONNECTOR)
124 select SND_PXA_SOC_SSP
125 select SND_SOC_CS4270
126 select SND_SOC_AK4104
127 help
128 Say Y if you want to add support for SoC audio on Raumfeld devices
129
120config SND_PXA2XX_SOC_MAGICIAN 130config SND_PXA2XX_SOC_MAGICIAN
121 tristate "SoC Audio support for HTC Magician" 131 tristate "SoC Audio support for HTC Magician"
122 depends on SND_PXA2XX_SOC && MACH_MAGICIAN 132 depends on SND_PXA2XX_SOC && MACH_MAGICIAN
diff --git a/sound/soc/pxa/Makefile b/sound/soc/pxa/Makefile
index 6e096b480335..f3e08fd40ca2 100644
--- a/sound/soc/pxa/Makefile
+++ b/sound/soc/pxa/Makefile
@@ -23,6 +23,7 @@ snd-soc-zylonite-objs := zylonite.o
23snd-soc-magician-objs := magician.o 23snd-soc-magician-objs := magician.o
24snd-soc-mioa701-objs := mioa701_wm9713.o 24snd-soc-mioa701-objs := mioa701_wm9713.o
25snd-soc-imote2-objs := imote2.o 25snd-soc-imote2-objs := imote2.o
26snd-soc-raumfeld-objs := raumfeld.o
26 27
27obj-$(CONFIG_SND_PXA2XX_SOC_CORGI) += snd-soc-corgi.o 28obj-$(CONFIG_SND_PXA2XX_SOC_CORGI) += snd-soc-corgi.o
28obj-$(CONFIG_SND_PXA2XX_SOC_POODLE) += snd-soc-poodle.o 29obj-$(CONFIG_SND_PXA2XX_SOC_POODLE) += snd-soc-poodle.o
@@ -37,3 +38,4 @@ obj-$(CONFIG_SND_PXA2XX_SOC_MAGICIAN) += snd-soc-magician.o
37obj-$(CONFIG_SND_PXA2XX_SOC_MIOA701) += snd-soc-mioa701.o 38obj-$(CONFIG_SND_PXA2XX_SOC_MIOA701) += snd-soc-mioa701.o
38obj-$(CONFIG_SND_SOC_ZYLONITE) += snd-soc-zylonite.o 39obj-$(CONFIG_SND_SOC_ZYLONITE) += snd-soc-zylonite.o
39obj-$(CONFIG_SND_PXA2XX_SOC_IMOTE2) += snd-soc-imote2.o 40obj-$(CONFIG_SND_PXA2XX_SOC_IMOTE2) += snd-soc-imote2.o
41obj-$(CONFIG_SND_SOC_RAUMFELD) += snd-soc-raumfeld.o
diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c
index 9f7c61e23daf..4c8d99a8d386 100644
--- a/sound/soc/pxa/magician.c
+++ b/sound/soc/pxa/magician.c
@@ -213,7 +213,7 @@ static int magician_playback_hw_params(struct snd_pcm_substream *substream,
213 return ret; 213 return ret;
214 214
215 /* set SSP audio pll clock */ 215 /* set SSP audio pll clock */
216 ret = snd_soc_dai_set_pll(cpu_dai, 0, 0, acps); 216 ret = snd_soc_dai_set_pll(cpu_dai, 0, 0, 0, acps);
217 if (ret < 0) 217 if (ret < 0)
218 return ret; 218 return ret;
219 219
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index d11a6d7e384a..544fd9566f4d 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -16,6 +16,7 @@
16 16
17#include <linux/init.h> 17#include <linux/init.h>
18#include <linux/module.h> 18#include <linux/module.h>
19#include <linux/slab.h>
19#include <linux/platform_device.h> 20#include <linux/platform_device.h>
20#include <linux/clk.h> 21#include <linux/clk.h>
21#include <linux/io.h> 22#include <linux/io.h>
@@ -42,11 +43,14 @@
42 * SSP audio private data 43 * SSP audio private data
43 */ 44 */
44struct ssp_priv { 45struct ssp_priv {
45 struct ssp_dev dev; 46 struct ssp_device *ssp;
46 unsigned int sysclk; 47 unsigned int sysclk;
47 int dai_fmt; 48 int dai_fmt;
48#ifdef CONFIG_PM 49#ifdef CONFIG_PM
49 struct ssp_state state; 50 uint32_t cr0;
51 uint32_t cr1;
52 uint32_t to;
53 uint32_t psp;
50#endif 54#endif
51}; 55};
52 56
@@ -61,6 +65,22 @@ static void dump_registers(struct ssp_device *ssp)
61 ssp_read_reg(ssp, SSACD)); 65 ssp_read_reg(ssp, SSACD));
62} 66}
63 67
68static void ssp_enable(struct ssp_device *ssp)
69{
70 uint32_t sscr0;
71
72 sscr0 = __raw_readl(ssp->mmio_base + SSCR0) | SSCR0_SSE;
73 __raw_writel(sscr0, ssp->mmio_base + SSCR0);
74}
75
76static void ssp_disable(struct ssp_device *ssp)
77{
78 uint32_t sscr0;
79
80 sscr0 = __raw_readl(ssp->mmio_base + SSCR0) & ~SSCR0_SSE;
81 __raw_writel(sscr0, ssp->mmio_base + SSCR0);
82}
83
64struct pxa2xx_pcm_dma_data { 84struct pxa2xx_pcm_dma_data {
65 struct pxa2xx_pcm_dma_params params; 85 struct pxa2xx_pcm_dma_params params;
66 char name[20]; 86 char name[20];
@@ -94,19 +114,17 @@ static int pxa_ssp_startup(struct snd_pcm_substream *substream,
94 struct snd_soc_pcm_runtime *rtd = substream->private_data; 114 struct snd_soc_pcm_runtime *rtd = substream->private_data;
95 struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; 115 struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
96 struct ssp_priv *priv = cpu_dai->private_data; 116 struct ssp_priv *priv = cpu_dai->private_data;
117 struct ssp_device *ssp = priv->ssp;
97 int ret = 0; 118 int ret = 0;
98 119
99 if (!cpu_dai->active) { 120 if (!cpu_dai->active) {
100 priv->dev.port = cpu_dai->id + 1; 121 clk_enable(ssp->clk);
101 priv->dev.irq = NO_IRQ; 122 ssp_disable(ssp);
102 clk_enable(priv->dev.ssp->clk);
103 ssp_disable(&priv->dev);
104 } 123 }
105 124
106 if (cpu_dai->dma_data) { 125 kfree(snd_soc_dai_get_dma_data(cpu_dai, substream));
107 kfree(cpu_dai->dma_data); 126 snd_soc_dai_set_dma_data(cpu_dai, substream, NULL);
108 cpu_dai->dma_data = NULL; 127
109 }
110 return ret; 128 return ret;
111} 129}
112 130
@@ -116,16 +134,15 @@ static void pxa_ssp_shutdown(struct snd_pcm_substream *substream,
116 struct snd_soc_pcm_runtime *rtd = substream->private_data; 134 struct snd_soc_pcm_runtime *rtd = substream->private_data;
117 struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; 135 struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
118 struct ssp_priv *priv = cpu_dai->private_data; 136 struct ssp_priv *priv = cpu_dai->private_data;
137 struct ssp_device *ssp = priv->ssp;
119 138
120 if (!cpu_dai->active) { 139 if (!cpu_dai->active) {
121 ssp_disable(&priv->dev); 140 ssp_disable(ssp);
122 clk_disable(priv->dev.ssp->clk); 141 clk_disable(ssp->clk);
123 } 142 }
124 143
125 if (cpu_dai->dma_data) { 144 kfree(snd_soc_dai_get_dma_data(cpu_dai, substream));
126 kfree(cpu_dai->dma_data); 145 snd_soc_dai_set_dma_data(cpu_dai, substream, NULL);
127 cpu_dai->dma_data = NULL;
128 }
129} 146}
130 147
131#ifdef CONFIG_PM 148#ifdef CONFIG_PM
@@ -133,25 +150,39 @@ static void pxa_ssp_shutdown(struct snd_pcm_substream *substream,
133static int pxa_ssp_suspend(struct snd_soc_dai *cpu_dai) 150static int pxa_ssp_suspend(struct snd_soc_dai *cpu_dai)
134{ 151{
135 struct ssp_priv *priv = cpu_dai->private_data; 152 struct ssp_priv *priv = cpu_dai->private_data;
153 struct ssp_device *ssp = priv->ssp;
136 154
137 if (!cpu_dai->active) 155 if (!cpu_dai->active)
138 return 0; 156 clk_enable(ssp->clk);
157
158 priv->cr0 = __raw_readl(ssp->mmio_base + SSCR0);
159 priv->cr1 = __raw_readl(ssp->mmio_base + SSCR1);
160 priv->to = __raw_readl(ssp->mmio_base + SSTO);
161 priv->psp = __raw_readl(ssp->mmio_base + SSPSP);
139 162
140 ssp_save_state(&priv->dev, &priv->state); 163 ssp_disable(ssp);
141 clk_disable(priv->dev.ssp->clk); 164 clk_disable(ssp->clk);
142 return 0; 165 return 0;
143} 166}
144 167
145static int pxa_ssp_resume(struct snd_soc_dai *cpu_dai) 168static int pxa_ssp_resume(struct snd_soc_dai *cpu_dai)
146{ 169{
147 struct ssp_priv *priv = cpu_dai->private_data; 170 struct ssp_priv *priv = cpu_dai->private_data;
171 struct ssp_device *ssp = priv->ssp;
172 uint32_t sssr = SSSR_ROR | SSSR_TUR | SSSR_BCE;
148 173
149 if (!cpu_dai->active) 174 clk_enable(ssp->clk);
150 return 0;
151 175
152 clk_enable(priv->dev.ssp->clk); 176 __raw_writel(sssr, ssp->mmio_base + SSSR);
153 ssp_restore_state(&priv->dev, &priv->state); 177 __raw_writel(priv->cr0 & ~SSCR0_SSE, ssp->mmio_base + SSCR0);
154 ssp_enable(&priv->dev); 178 __raw_writel(priv->cr1, ssp->mmio_base + SSCR1);
179 __raw_writel(priv->to, ssp->mmio_base + SSTO);
180 __raw_writel(priv->psp, ssp->mmio_base + SSPSP);
181
182 if (cpu_dai->active)
183 ssp_enable(ssp);
184 else
185 clk_disable(ssp->clk);
155 186
156 return 0; 187 return 0;
157} 188}
@@ -201,7 +232,7 @@ static int pxa_ssp_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
201 int clk_id, unsigned int freq, int dir) 232 int clk_id, unsigned int freq, int dir)
202{ 233{
203 struct ssp_priv *priv = cpu_dai->private_data; 234 struct ssp_priv *priv = cpu_dai->private_data;
204 struct ssp_device *ssp = priv->dev.ssp; 235 struct ssp_device *ssp = priv->ssp;
205 int val; 236 int val;
206 237
207 u32 sscr0 = ssp_read_reg(ssp, SSCR0) & 238 u32 sscr0 = ssp_read_reg(ssp, SSCR0) &
@@ -242,11 +273,11 @@ static int pxa_ssp_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
242 /* The SSP clock must be disabled when changing SSP clock mode 273 /* The SSP clock must be disabled when changing SSP clock mode
243 * on PXA2xx. On PXA3xx it must be enabled when doing so. */ 274 * on PXA2xx. On PXA3xx it must be enabled when doing so. */
244 if (!cpu_is_pxa3xx()) 275 if (!cpu_is_pxa3xx())
245 clk_disable(priv->dev.ssp->clk); 276 clk_disable(ssp->clk);
246 val = ssp_read_reg(ssp, SSCR0) | sscr0; 277 val = ssp_read_reg(ssp, SSCR0) | sscr0;
247 ssp_write_reg(ssp, SSCR0, val); 278 ssp_write_reg(ssp, SSCR0, val);
248 if (!cpu_is_pxa3xx()) 279 if (!cpu_is_pxa3xx())
249 clk_enable(priv->dev.ssp->clk); 280 clk_enable(ssp->clk);
250 281
251 return 0; 282 return 0;
252} 283}
@@ -258,7 +289,7 @@ static int pxa_ssp_set_dai_clkdiv(struct snd_soc_dai *cpu_dai,
258 int div_id, int div) 289 int div_id, int div)
259{ 290{
260 struct ssp_priv *priv = cpu_dai->private_data; 291 struct ssp_priv *priv = cpu_dai->private_data;
261 struct ssp_device *ssp = priv->dev.ssp; 292 struct ssp_device *ssp = priv->ssp;
262 int val; 293 int val;
263 294
264 switch (div_id) { 295 switch (div_id) {
@@ -305,11 +336,11 @@ static int pxa_ssp_set_dai_clkdiv(struct snd_soc_dai *cpu_dai,
305/* 336/*
306 * Configure the PLL frequency pxa27x and (afaik - pxa320 only) 337 * Configure the PLL frequency pxa27x and (afaik - pxa320 only)
307 */ 338 */
308static int pxa_ssp_set_dai_pll(struct snd_soc_dai *cpu_dai, 339static int pxa_ssp_set_dai_pll(struct snd_soc_dai *cpu_dai, int pll_id,
309 int pll_id, unsigned int freq_in, unsigned int freq_out) 340 int source, unsigned int freq_in, unsigned int freq_out)
310{ 341{
311 struct ssp_priv *priv = cpu_dai->private_data; 342 struct ssp_priv *priv = cpu_dai->private_data;
312 struct ssp_device *ssp = priv->dev.ssp; 343 struct ssp_device *ssp = priv->ssp;
313 u32 ssacd = ssp_read_reg(ssp, SSACD) & ~0x70; 344 u32 ssacd = ssp_read_reg(ssp, SSACD) & ~0x70;
314 345
315#if defined(CONFIG_PXA3xx) 346#if defined(CONFIG_PXA3xx)
@@ -378,7 +409,7 @@ static int pxa_ssp_set_dai_tdm_slot(struct snd_soc_dai *cpu_dai,
378 unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width) 409 unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width)
379{ 410{
380 struct ssp_priv *priv = cpu_dai->private_data; 411 struct ssp_priv *priv = cpu_dai->private_data;
381 struct ssp_device *ssp = priv->dev.ssp; 412 struct ssp_device *ssp = priv->ssp;
382 u32 sscr0; 413 u32 sscr0;
383 414
384 sscr0 = ssp_read_reg(ssp, SSCR0); 415 sscr0 = ssp_read_reg(ssp, SSCR0);
@@ -413,7 +444,7 @@ static int pxa_ssp_set_dai_tristate(struct snd_soc_dai *cpu_dai,
413 int tristate) 444 int tristate)
414{ 445{
415 struct ssp_priv *priv = cpu_dai->private_data; 446 struct ssp_priv *priv = cpu_dai->private_data;
416 struct ssp_device *ssp = priv->dev.ssp; 447 struct ssp_device *ssp = priv->ssp;
417 u32 sscr1; 448 u32 sscr1;
418 449
419 sscr1 = ssp_read_reg(ssp, SSCR1); 450 sscr1 = ssp_read_reg(ssp, SSCR1);
@@ -435,7 +466,7 @@ static int pxa_ssp_set_dai_fmt(struct snd_soc_dai *cpu_dai,
435 unsigned int fmt) 466 unsigned int fmt)
436{ 467{
437 struct ssp_priv *priv = cpu_dai->private_data; 468 struct ssp_priv *priv = cpu_dai->private_data;
438 struct ssp_device *ssp = priv->dev.ssp; 469 struct ssp_device *ssp = priv->ssp;
439 u32 sscr0; 470 u32 sscr0;
440 u32 sscr1; 471 u32 sscr1;
441 u32 sspsp; 472 u32 sspsp;
@@ -530,25 +561,29 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream,
530 struct snd_soc_pcm_runtime *rtd = substream->private_data; 561 struct snd_soc_pcm_runtime *rtd = substream->private_data;
531 struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; 562 struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
532 struct ssp_priv *priv = cpu_dai->private_data; 563 struct ssp_priv *priv = cpu_dai->private_data;
533 struct ssp_device *ssp = priv->dev.ssp; 564 struct ssp_device *ssp = priv->ssp;
534 int chn = params_channels(params); 565 int chn = params_channels(params);
535 u32 sscr0; 566 u32 sscr0;
536 u32 sspsp; 567 u32 sspsp;
537 int width = snd_pcm_format_physical_width(params_format(params)); 568 int width = snd_pcm_format_physical_width(params_format(params));
538 int ttsa = ssp_read_reg(ssp, SSTSA) & 0xf; 569 int ttsa = ssp_read_reg(ssp, SSTSA) & 0xf;
570 struct pxa2xx_pcm_dma_params *dma_data;
571
572 dma_data = snd_soc_dai_get_dma_data(dai, substream);
539 573
540 /* generate correct DMA params */ 574 /* generate correct DMA params */
541 if (cpu_dai->dma_data) 575 kfree(dma_data);
542 kfree(cpu_dai->dma_data);
543 576
544 /* Network mode with one active slot (ttsa == 1) can be used 577 /* Network mode with one active slot (ttsa == 1) can be used
545 * to force 16-bit frame width on the wire (for S16_LE), even 578 * to force 16-bit frame width on the wire (for S16_LE), even
546 * with two channels. Use 16-bit DMA transfers for this case. 579 * with two channels. Use 16-bit DMA transfers for this case.
547 */ 580 */
548 cpu_dai->dma_data = ssp_get_dma_params(ssp, 581 dma_data = ssp_get_dma_params(ssp,
549 ((chn == 2) && (ttsa != 1)) || (width == 32), 582 ((chn == 2) && (ttsa != 1)) || (width == 32),
550 substream->stream == SNDRV_PCM_STREAM_PLAYBACK); 583 substream->stream == SNDRV_PCM_STREAM_PLAYBACK);
551 584
585 snd_soc_dai_set_dma_data(dai, substream, dma_data);
586
552 /* we can only change the settings if the port is not in use */ 587 /* we can only change the settings if the port is not in use */
553 if (ssp_read_reg(ssp, SSCR0) & SSCR0_SSE) 588 if (ssp_read_reg(ssp, SSCR0) & SSCR0_SSE)
554 return 0; 589 return 0;
@@ -640,12 +675,12 @@ static int pxa_ssp_trigger(struct snd_pcm_substream *substream, int cmd,
640 struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; 675 struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
641 int ret = 0; 676 int ret = 0;
642 struct ssp_priv *priv = cpu_dai->private_data; 677 struct ssp_priv *priv = cpu_dai->private_data;
643 struct ssp_device *ssp = priv->dev.ssp; 678 struct ssp_device *ssp = priv->ssp;
644 int val; 679 int val;
645 680
646 switch (cmd) { 681 switch (cmd) {
647 case SNDRV_PCM_TRIGGER_RESUME: 682 case SNDRV_PCM_TRIGGER_RESUME:
648 ssp_enable(&priv->dev); 683 ssp_enable(ssp);
649 break; 684 break;
650 case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: 685 case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
651 val = ssp_read_reg(ssp, SSCR1); 686 val = ssp_read_reg(ssp, SSCR1);
@@ -664,7 +699,7 @@ static int pxa_ssp_trigger(struct snd_pcm_substream *substream, int cmd,
664 else 699 else
665 val |= SSCR1_RSRE; 700 val |= SSCR1_RSRE;
666 ssp_write_reg(ssp, SSCR1, val); 701 ssp_write_reg(ssp, SSCR1, val);
667 ssp_enable(&priv->dev); 702 ssp_enable(ssp);
668 break; 703 break;
669 case SNDRV_PCM_TRIGGER_STOP: 704 case SNDRV_PCM_TRIGGER_STOP:
670 val = ssp_read_reg(ssp, SSCR1); 705 val = ssp_read_reg(ssp, SSCR1);
@@ -675,7 +710,7 @@ static int pxa_ssp_trigger(struct snd_pcm_substream *substream, int cmd,
675 ssp_write_reg(ssp, SSCR1, val); 710 ssp_write_reg(ssp, SSCR1, val);
676 break; 711 break;
677 case SNDRV_PCM_TRIGGER_SUSPEND: 712 case SNDRV_PCM_TRIGGER_SUSPEND:
678 ssp_disable(&priv->dev); 713 ssp_disable(ssp);
679 break; 714 break;
680 case SNDRV_PCM_TRIGGER_PAUSE_PUSH: 715 case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
681 val = ssp_read_reg(ssp, SSCR1); 716 val = ssp_read_reg(ssp, SSCR1);
@@ -705,8 +740,8 @@ static int pxa_ssp_probe(struct platform_device *pdev,
705 if (!priv) 740 if (!priv)
706 return -ENOMEM; 741 return -ENOMEM;
707 742
708 priv->dev.ssp = ssp_request(dai->id + 1, "SoC audio"); 743 priv->ssp = ssp_request(dai->id + 1, "SoC audio");
709 if (priv->dev.ssp == NULL) { 744 if (priv->ssp == NULL) {
710 ret = -ENODEV; 745 ret = -ENODEV;
711 goto err_priv; 746 goto err_priv;
712 } 747 }
@@ -725,7 +760,7 @@ static void pxa_ssp_remove(struct platform_device *pdev,
725 struct snd_soc_dai *dai) 760 struct snd_soc_dai *dai)
726{ 761{
727 struct ssp_priv *priv = dai->private_data; 762 struct ssp_priv *priv = dai->private_data;
728 ssp_free(priv->dev.ssp); 763 ssp_free(priv->ssp);
729} 764}
730 765
731#define PXA_SSP_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\ 766#define PXA_SSP_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\
@@ -760,13 +795,13 @@ struct snd_soc_dai pxa_ssp_dai[] = {
760 .resume = pxa_ssp_resume, 795 .resume = pxa_ssp_resume,
761 .playback = { 796 .playback = {
762 .channels_min = 1, 797 .channels_min = 1,
763 .channels_max = 2, 798 .channels_max = 8,
764 .rates = PXA_SSP_RATES, 799 .rates = PXA_SSP_RATES,
765 .formats = PXA_SSP_FORMATS, 800 .formats = PXA_SSP_FORMATS,
766 }, 801 },
767 .capture = { 802 .capture = {
768 .channels_min = 1, 803 .channels_min = 1,
769 .channels_max = 2, 804 .channels_max = 8,
770 .rates = PXA_SSP_RATES, 805 .rates = PXA_SSP_RATES,
771 .formats = PXA_SSP_FORMATS, 806 .formats = PXA_SSP_FORMATS,
772 }, 807 },
@@ -780,13 +815,13 @@ struct snd_soc_dai pxa_ssp_dai[] = {
780 .resume = pxa_ssp_resume, 815 .resume = pxa_ssp_resume,
781 .playback = { 816 .playback = {
782 .channels_min = 1, 817 .channels_min = 1,
783 .channels_max = 2, 818 .channels_max = 8,
784 .rates = PXA_SSP_RATES, 819 .rates = PXA_SSP_RATES,
785 .formats = PXA_SSP_FORMATS, 820 .formats = PXA_SSP_FORMATS,
786 }, 821 },
787 .capture = { 822 .capture = {
788 .channels_min = 1, 823 .channels_min = 1,
789 .channels_max = 2, 824 .channels_max = 8,
790 .rates = PXA_SSP_RATES, 825 .rates = PXA_SSP_RATES,
791 .formats = PXA_SSP_FORMATS, 826 .formats = PXA_SSP_FORMATS,
792 }, 827 },
@@ -801,13 +836,13 @@ struct snd_soc_dai pxa_ssp_dai[] = {
801 .resume = pxa_ssp_resume, 836 .resume = pxa_ssp_resume,
802 .playback = { 837 .playback = {
803 .channels_min = 1, 838 .channels_min = 1,
804 .channels_max = 2, 839 .channels_max = 8,
805 .rates = PXA_SSP_RATES, 840 .rates = PXA_SSP_RATES,
806 .formats = PXA_SSP_FORMATS, 841 .formats = PXA_SSP_FORMATS,
807 }, 842 },
808 .capture = { 843 .capture = {
809 .channels_min = 1, 844 .channels_min = 1,
810 .channels_max = 2, 845 .channels_max = 8,
811 .rates = PXA_SSP_RATES, 846 .rates = PXA_SSP_RATES,
812 .formats = PXA_SSP_FORMATS, 847 .formats = PXA_SSP_FORMATS,
813 }, 848 },
@@ -822,13 +857,13 @@ struct snd_soc_dai pxa_ssp_dai[] = {
822 .resume = pxa_ssp_resume, 857 .resume = pxa_ssp_resume,
823 .playback = { 858 .playback = {
824 .channels_min = 1, 859 .channels_min = 1,
825 .channels_max = 2, 860 .channels_max = 8,
826 .rates = PXA_SSP_RATES, 861 .rates = PXA_SSP_RATES,
827 .formats = PXA_SSP_FORMATS, 862 .formats = PXA_SSP_FORMATS,
828 }, 863 },
829 .capture = { 864 .capture = {
830 .channels_min = 1, 865 .channels_min = 1,
831 .channels_max = 2, 866 .channels_max = 8,
832 .rates = PXA_SSP_RATES, 867 .rates = PXA_SSP_RATES,
833 .formats = PXA_SSP_FORMATS, 868 .formats = PXA_SSP_FORMATS,
834 }, 869 },
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
index e9ae7b3a7e00..d314115e3dd7 100644
--- a/sound/soc/pxa/pxa2xx-ac97.c
+++ b/sound/soc/pxa/pxa2xx-ac97.c
@@ -122,11 +122,14 @@ static int pxa2xx_ac97_hw_params(struct snd_pcm_substream *substream,
122{ 122{
123 struct snd_soc_pcm_runtime *rtd = substream->private_data; 123 struct snd_soc_pcm_runtime *rtd = substream->private_data;
124 struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; 124 struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
125 struct pxa2xx_pcm_dma_params *dma_data;
125 126
126 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) 127 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
127 cpu_dai->dma_data = &pxa2xx_ac97_pcm_stereo_out; 128 dma_data = &pxa2xx_ac97_pcm_stereo_out;
128 else 129 else
129 cpu_dai->dma_data = &pxa2xx_ac97_pcm_stereo_in; 130 dma_data = &pxa2xx_ac97_pcm_stereo_in;
131
132 snd_soc_dai_set_dma_data(cpu_dai, substream, dma_data);
130 133
131 return 0; 134 return 0;
132} 135}
@@ -137,11 +140,14 @@ static int pxa2xx_ac97_hw_aux_params(struct snd_pcm_substream *substream,
137{ 140{
138 struct snd_soc_pcm_runtime *rtd = substream->private_data; 141 struct snd_soc_pcm_runtime *rtd = substream->private_data;
139 struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; 142 struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
143 struct pxa2xx_pcm_dma_params *dma_data;
140 144
141 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) 145 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
142 cpu_dai->dma_data = &pxa2xx_ac97_pcm_aux_mono_out; 146 dma_data = &pxa2xx_ac97_pcm_aux_mono_out;
143 else 147 else
144 cpu_dai->dma_data = &pxa2xx_ac97_pcm_aux_mono_in; 148 dma_data = &pxa2xx_ac97_pcm_aux_mono_in;
149
150 snd_soc_dai_set_dma_data(cpu_dai, substream, dma_data);
145 151
146 return 0; 152 return 0;
147} 153}
@@ -156,7 +162,8 @@ static int pxa2xx_ac97_hw_mic_params(struct snd_pcm_substream *substream,
156 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) 162 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
157 return -ENODEV; 163 return -ENODEV;
158 else 164 else
159 cpu_dai->dma_data = &pxa2xx_ac97_pcm_mic_mono_in; 165 snd_soc_dai_set_dma_data(cpu_dai, substream,
166 &pxa2xx_ac97_pcm_mic_mono_in);
160 167
161 return 0; 168 return 0;
162} 169}
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c
index 6b8f655d1ad8..c1a5275721e4 100644
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@ -164,6 +164,7 @@ static int pxa2xx_i2s_hw_params(struct snd_pcm_substream *substream,
164{ 164{
165 struct snd_soc_pcm_runtime *rtd = substream->private_data; 165 struct snd_soc_pcm_runtime *rtd = substream->private_data;
166 struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; 166 struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
167 struct pxa2xx_pcm_dma_params *dma_data;
167 168
168 BUG_ON(IS_ERR(clk_i2s)); 169 BUG_ON(IS_ERR(clk_i2s));
169 clk_enable(clk_i2s); 170 clk_enable(clk_i2s);
@@ -171,9 +172,11 @@ static int pxa2xx_i2s_hw_params(struct snd_pcm_substream *substream,
171 pxa_i2s_wait(); 172 pxa_i2s_wait();
172 173
173 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) 174 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
174 cpu_dai->dma_data = &pxa2xx_i2s_pcm_stereo_out; 175 dma_data = &pxa2xx_i2s_pcm_stereo_out;
175 else 176 else
176 cpu_dai->dma_data = &pxa2xx_i2s_pcm_stereo_in; 177 dma_data = &pxa2xx_i2s_pcm_stereo_in;
178
179 snd_soc_dai_set_dma_data(cpu_dai, substream, dma_data);
177 180
178 /* is port used by another stream */ 181 /* is port used by another stream */
179 if (!(SACR0 & SACR0_ENB)) { 182 if (!(SACR0 & SACR0_ENB)) {
diff --git a/sound/soc/pxa/pxa2xx-pcm.c b/sound/soc/pxa/pxa2xx-pcm.c
index d38e39575f51..adc7e6f15f93 100644
--- a/sound/soc/pxa/pxa2xx-pcm.c
+++ b/sound/soc/pxa/pxa2xx-pcm.c
@@ -25,9 +25,11 @@ static int pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream,
25 struct snd_pcm_runtime *runtime = substream->runtime; 25 struct snd_pcm_runtime *runtime = substream->runtime;
26 struct pxa2xx_runtime_data *prtd = runtime->private_data; 26 struct pxa2xx_runtime_data *prtd = runtime->private_data;
27 struct snd_soc_pcm_runtime *rtd = substream->private_data; 27 struct snd_soc_pcm_runtime *rtd = substream->private_data;
28 struct pxa2xx_pcm_dma_params *dma = rtd->dai->cpu_dai->dma_data; 28 struct pxa2xx_pcm_dma_params *dma;
29 int ret; 29 int ret;
30 30
31 dma = snd_soc_dai_get_dma_data(rtd->dai->cpu_dai, substream);
32
31 /* return if this is a bufferless transfer e.g. 33 /* return if this is a bufferless transfer e.g.
32 * codec <--> BT codec or GSM modem -- lg FIXME */ 34 * codec <--> BT codec or GSM modem -- lg FIXME */
33 if (!dma) 35 if (!dma)
diff --git a/sound/soc/pxa/raumfeld.c b/sound/soc/pxa/raumfeld.c
new file mode 100644
index 000000000000..7e3f41696c41
--- /dev/null
+++ b/sound/soc/pxa/raumfeld.c
@@ -0,0 +1,354 @@
1/*
2 * raumfeld_audio.c -- SoC audio for Raumfeld audio devices
3 *
4 * Copyright (c) 2009 Daniel Mack <daniel@caiaq.de>
5 *
6 * based on code from:
7 *
8 * Wolfson Microelectronics PLC.
9 * Openedhand Ltd.
10 * Liam Girdwood <lrg@slimlogic.co.uk>
11 * Richard Purdie <richard@openedhand.com>
12 *
13 * This program is free software; you can redistribute it and/or modify it
14 * under the terms of the GNU General Public License as published by the
15 * Free Software Foundation; either version 2 of the License, or (at your
16 * option) any later version.
17 */
18
19#include <linux/module.h>
20#include <linux/i2c.h>
21#include <linux/delay.h>
22#include <linux/gpio.h>
23#include <sound/pcm.h>
24#include <sound/soc.h>
25#include <sound/soc-dapm.h>
26
27#include <asm/mach-types.h>
28
29#include "../codecs/cs4270.h"
30#include "../codecs/ak4104.h"
31#include "pxa2xx-pcm.h"
32#include "pxa-ssp.h"
33
34#define GPIO_SPDIF_RESET (38)
35#define GPIO_MCLK_RESET (111)
36#define GPIO_CODEC_RESET (120)
37
38static struct i2c_client *max9486_client;
39static struct i2c_board_info max9486_hwmon_info = {
40 I2C_BOARD_INFO("max9485", 0x63),
41};
42
43#define MAX9485_MCLK_FREQ_112896 0x22
44#define MAX9485_MCLK_FREQ_122880 0x23
45#define MAX9485_MCLK_FREQ_225792 0x32
46#define MAX9485_MCLK_FREQ_245760 0x33
47
48static void set_max9485_clk(char clk)
49{
50 i2c_master_send(max9486_client, &clk, 1);
51}
52
53static void raumfeld_enable_audio(bool en)
54{
55 if (en) {
56 gpio_set_value(GPIO_MCLK_RESET, 1);
57
58 /* wait some time to let the clocks become stable */
59 msleep(100);
60
61 gpio_set_value(GPIO_SPDIF_RESET, 1);
62 gpio_set_value(GPIO_CODEC_RESET, 1);
63 } else {
64 gpio_set_value(GPIO_MCLK_RESET, 0);
65 gpio_set_value(GPIO_SPDIF_RESET, 0);
66 gpio_set_value(GPIO_CODEC_RESET, 0);
67 }
68}
69
70/* CS4270 */
71static int raumfeld_cs4270_startup(struct snd_pcm_substream *substream)
72{
73 struct snd_soc_pcm_runtime *rtd = substream->private_data;
74 struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
75
76 /* set freq to 0 to enable all possible codec sample rates */
77 return snd_soc_dai_set_sysclk(codec_dai, 0, 0, 0);
78}
79
80static void raumfeld_cs4270_shutdown(struct snd_pcm_substream *substream)
81{
82 struct snd_soc_pcm_runtime *rtd = substream->private_data;
83 struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
84
85 /* set freq to 0 to enable all possible codec sample rates */
86 snd_soc_dai_set_sysclk(codec_dai, 0, 0, 0);
87}
88
89static int raumfeld_cs4270_hw_params(struct snd_pcm_substream *substream,
90 struct snd_pcm_hw_params *params)
91{
92 struct snd_soc_pcm_runtime *rtd = substream->private_data;
93 struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
94 struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
95 unsigned int fmt, clk = 0;
96 int ret = 0;
97
98 switch (params_rate(params)) {
99 case 44100:
100 set_max9485_clk(MAX9485_MCLK_FREQ_112896);
101 clk = 11289600;
102 break;
103 case 48000:
104 set_max9485_clk(MAX9485_MCLK_FREQ_122880);
105 clk = 12288000;
106 break;
107 case 88200:
108 set_max9485_clk(MAX9485_MCLK_FREQ_225792);
109 clk = 22579200;
110 break;
111 case 96000:
112 set_max9485_clk(MAX9485_MCLK_FREQ_245760);
113 clk = 24576000;
114 break;
115 default:
116 return -EINVAL;
117 }
118
119 fmt = SND_SOC_DAIFMT_I2S |
120 SND_SOC_DAIFMT_NB_NF |
121 SND_SOC_DAIFMT_CBS_CFS;
122
123 /* setup the CODEC DAI */
124 ret = snd_soc_dai_set_fmt(codec_dai, fmt);
125 if (ret < 0)
126 return ret;
127
128 ret = snd_soc_dai_set_sysclk(codec_dai, 0, clk, 0);
129 if (ret < 0)
130 return ret;
131
132 /* setup the CPU DAI */
133 ret = snd_soc_dai_set_pll(cpu_dai, 0, 0, 0, clk);
134 if (ret < 0)
135 return ret;
136
137 ret = snd_soc_dai_set_fmt(cpu_dai, fmt);
138 if (ret < 0)
139 return ret;
140
141 ret = snd_soc_dai_set_clkdiv(cpu_dai, PXA_SSP_DIV_SCR, 4);
142 if (ret < 0)
143 return ret;
144
145 ret = snd_soc_dai_set_sysclk(cpu_dai, PXA_SSP_CLK_EXT, clk, 1);
146 if (ret < 0)
147 return ret;
148
149 return 0;
150}
151
152static struct snd_soc_ops raumfeld_cs4270_ops = {
153 .startup = raumfeld_cs4270_startup,
154 .shutdown = raumfeld_cs4270_shutdown,
155 .hw_params = raumfeld_cs4270_hw_params,
156};
157
158static int raumfeld_line_suspend(struct platform_device *pdev, pm_message_t state)
159{
160 raumfeld_enable_audio(false);
161 return 0;
162}
163
164static int raumfeld_line_resume(struct platform_device *pdev)
165{
166 raumfeld_enable_audio(true);
167 return 0;
168}
169
170static struct snd_soc_dai_link raumfeld_line_dai = {
171 .name = "CS4270",
172 .stream_name = "CS4270",
173 .cpu_dai = &pxa_ssp_dai[PXA_DAI_SSP1],
174 .codec_dai = &cs4270_dai,
175 .ops = &raumfeld_cs4270_ops,
176};
177
178static struct snd_soc_card snd_soc_line_raumfeld = {
179 .name = "Raumfeld analog",
180 .platform = &pxa2xx_soc_platform,
181 .dai_link = &raumfeld_line_dai,
182 .suspend_post = raumfeld_line_suspend,
183 .resume_pre = raumfeld_line_resume,
184 .num_links = 1,
185};
186
187
188/* AK4104 */
189
190static int raumfeld_ak4104_hw_params(struct snd_pcm_substream *substream,
191 struct snd_pcm_hw_params *params)
192{
193 struct snd_soc_pcm_runtime *rtd = substream->private_data;
194 struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
195 struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
196 int fmt, ret = 0, clk = 0;
197
198 switch (params_rate(params)) {
199 case 44100:
200 set_max9485_clk(MAX9485_MCLK_FREQ_112896);
201 clk = 11289600;
202 break;
203 case 48000:
204 set_max9485_clk(MAX9485_MCLK_FREQ_122880);
205 clk = 12288000;
206 break;
207 case 88200:
208 set_max9485_clk(MAX9485_MCLK_FREQ_225792);
209 clk = 22579200;
210 break;
211 case 96000:
212 set_max9485_clk(MAX9485_MCLK_FREQ_245760);
213 clk = 24576000;
214 break;
215 default:
216 return -EINVAL;
217 }
218
219 fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF;
220
221 /* setup the CODEC DAI */
222 ret = snd_soc_dai_set_fmt(codec_dai, fmt | SND_SOC_DAIFMT_CBS_CFS);
223 if (ret < 0)
224 return ret;
225
226 /* setup the CPU DAI */
227 ret = snd_soc_dai_set_pll(cpu_dai, 0, 0, 0, clk);
228 if (ret < 0)
229 return ret;
230
231 ret = snd_soc_dai_set_fmt(cpu_dai, fmt | SND_SOC_DAIFMT_CBS_CFS);
232 if (ret < 0)
233 return ret;
234
235 ret = snd_soc_dai_set_clkdiv(cpu_dai, PXA_SSP_DIV_SCR, 4);
236 if (ret < 0)
237 return ret;
238
239 ret = snd_soc_dai_set_sysclk(cpu_dai, PXA_SSP_CLK_EXT, clk, 1);
240 if (ret < 0)
241 return ret;
242
243 return 0;
244}
245
246static struct snd_soc_ops raumfeld_ak4104_ops = {
247 .hw_params = raumfeld_ak4104_hw_params,
248};
249
250static struct snd_soc_dai_link raumfeld_spdif_dai = {
251 .name = "ak4104",
252 .stream_name = "Playback",
253 .cpu_dai = &pxa_ssp_dai[PXA_DAI_SSP2],
254 .codec_dai = &ak4104_dai,
255 .ops = &raumfeld_ak4104_ops,
256};
257
258static struct snd_soc_card snd_soc_spdif_raumfeld = {
259 .name = "Raumfeld S/PDIF",
260 .platform = &pxa2xx_soc_platform,
261 .dai_link = &raumfeld_spdif_dai,
262 .num_links = 1
263};
264
265/* raumfeld_audio audio subsystem */
266static struct snd_soc_device raumfeld_line_devdata = {
267 .card = &snd_soc_line_raumfeld,
268 .codec_dev = &soc_codec_device_cs4270,
269};
270
271static struct snd_soc_device raumfeld_spdif_devdata = {
272 .card = &snd_soc_spdif_raumfeld,
273 .codec_dev = &soc_codec_device_ak4104,
274};
275
276static struct platform_device *raumfeld_audio_line_device;
277static struct platform_device *raumfeld_audio_spdif_device;
278
279static int __init raumfeld_audio_init(void)
280{
281 int ret;
282
283 if (!machine_is_raumfeld_speaker() &&
284 !machine_is_raumfeld_connector())
285 return 0;
286
287 max9486_client = i2c_new_device(i2c_get_adapter(0),
288 &max9486_hwmon_info);
289
290 if (!max9486_client)
291 return -ENOMEM;
292
293 set_max9485_clk(MAX9485_MCLK_FREQ_122880);
294
295 /* LINE */
296 raumfeld_audio_line_device = platform_device_alloc("soc-audio", 0);
297 if (!raumfeld_audio_line_device)
298 return -ENOMEM;
299
300 platform_set_drvdata(raumfeld_audio_line_device,
301 &raumfeld_line_devdata);
302 raumfeld_line_devdata.dev = &raumfeld_audio_line_device->dev;
303 ret = platform_device_add(raumfeld_audio_line_device);
304 if (ret)
305 platform_device_put(raumfeld_audio_line_device);
306
307 /* no S/PDIF on Speakers */
308 if (machine_is_raumfeld_speaker())
309 return ret;
310
311 /* S/PDIF */
312 raumfeld_audio_spdif_device = platform_device_alloc("soc-audio", 1);
313 if (!raumfeld_audio_spdif_device) {
314 platform_device_put(raumfeld_audio_line_device);
315 return -ENOMEM;
316 }
317
318 platform_set_drvdata(raumfeld_audio_spdif_device,
319 &raumfeld_spdif_devdata);
320 raumfeld_spdif_devdata.dev = &raumfeld_audio_spdif_device->dev;
321 ret = platform_device_add(raumfeld_audio_spdif_device);
322 if (ret) {
323 platform_device_put(raumfeld_audio_line_device);
324 platform_device_put(raumfeld_audio_spdif_device);
325 }
326
327 raumfeld_enable_audio(true);
328
329 return ret;
330}
331
332static void __exit raumfeld_audio_exit(void)
333{
334 raumfeld_enable_audio(false);
335
336 platform_device_unregister(raumfeld_audio_line_device);
337
338 if (machine_is_raumfeld_connector())
339 platform_device_unregister(raumfeld_audio_spdif_device);
340
341 i2c_unregister_device(max9486_client);
342
343 gpio_free(GPIO_MCLK_RESET);
344 gpio_free(GPIO_CODEC_RESET);
345 gpio_free(GPIO_SPDIF_RESET);
346}
347
348module_init(raumfeld_audio_init);
349module_exit(raumfeld_audio_exit);
350
351/* Module information */
352MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
353MODULE_DESCRIPTION("Raumfeld audio SoC");
354MODULE_LICENSE("GPL");
diff --git a/sound/soc/pxa/zylonite.c b/sound/soc/pxa/zylonite.c
index 9a386b4c4ed1..dd678ae24398 100644
--- a/sound/soc/pxa/zylonite.c
+++ b/sound/soc/pxa/zylonite.c
@@ -74,7 +74,8 @@ static const struct snd_soc_dapm_route audio_map[] = {
74static int zylonite_wm9713_init(struct snd_soc_codec *codec) 74static int zylonite_wm9713_init(struct snd_soc_codec *codec)
75{ 75{
76 if (clk_pout) 76 if (clk_pout)
77 snd_soc_dai_set_pll(&codec->dai[0], 0, clk_get_rate(pout), 0); 77 snd_soc_dai_set_pll(&codec->dai[0], 0, 0,
78 clk_get_rate(pout), 0);
78 79
79 snd_soc_dapm_new_controls(codec, zylonite_dapm_widgets, 80 snd_soc_dapm_new_controls(codec, zylonite_dapm_widgets,
80 ARRAY_SIZE(zylonite_dapm_widgets)); 81 ARRAY_SIZE(zylonite_dapm_widgets));
@@ -128,7 +129,7 @@ static int zylonite_voice_hw_params(struct snd_pcm_substream *substream,
128 if (ret < 0) 129 if (ret < 0)
129 return ret; 130 return ret;
130 131
131 ret = snd_soc_dai_set_pll(cpu_dai, 0, 0, pll_out); 132 ret = snd_soc_dai_set_pll(cpu_dai, 0, 0, 0, pll_out);
132 if (ret < 0) 133 if (ret < 0)
133 return ret; 134 return ret;
134 135
generated by cgit v1.2.2 (git 2.25.0) at 2025-04-06 18:52:49 -0400