|
@@ -1751,6 +1751,7 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev)
|
|
|
{
|
|
|
struct snd_card *card;
|
|
|
struct snd_intelhad_card *card_ctx;
|
|
|
+ struct snd_intelhad *ctx;
|
|
|
struct snd_pcm *pcm;
|
|
|
struct intel_hdmi_lpe_audio_pdata *pdata;
|
|
|
int irq;
|
|
@@ -1795,6 +1796,21 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev)
|
|
|
|
|
|
platform_set_drvdata(pdev, card_ctx);
|
|
|
|
|
|
+ card_ctx->num_pipes = pdata->num_pipes;
|
|
|
+ card_ctx->num_ports = single_port ? 1 : pdata->num_ports;
|
|
|
+
|
|
|
+ for_each_port(card_ctx, port) {
|
|
|
+ ctx = &card_ctx->pcm_ctx[port];
|
|
|
+ ctx->card_ctx = card_ctx;
|
|
|
+ ctx->dev = card_ctx->dev;
|
|
|
+ ctx->port = single_port ? -1 : port;
|
|
|
+ ctx->pipe = -1;
|
|
|
+
|
|
|
+ spin_lock_init(&ctx->had_spinlock);
|
|
|
+ mutex_init(&ctx->mutex);
|
|
|
+ INIT_WORK(&ctx->hdmi_audio_wq, had_audio_wq);
|
|
|
+ }
|
|
|
+
|
|
|
dev_dbg(&pdev->dev, "%s: mmio_start = 0x%x, mmio_end = 0x%x\n",
|
|
|
__func__, (unsigned int)res_mmio->start,
|
|
|
(unsigned int)res_mmio->end);
|
|
@@ -1827,18 +1843,9 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev)
|
|
|
card_ctx->num_ports = single_port ? 1 : pdata->num_ports;
|
|
|
|
|
|
for_each_port(card_ctx, port) {
|
|
|
- struct snd_intelhad *ctx = &card_ctx->pcm_ctx[port];
|
|
|
int i;
|
|
|
|
|
|
- ctx->card_ctx = card_ctx;
|
|
|
- ctx->dev = card_ctx->dev;
|
|
|
- ctx->port = single_port ? -1 : port;
|
|
|
- ctx->pipe = -1;
|
|
|
-
|
|
|
- spin_lock_init(&ctx->had_spinlock);
|
|
|
- mutex_init(&ctx->mutex);
|
|
|
- INIT_WORK(&ctx->hdmi_audio_wq, had_audio_wq);
|
|
|
-
|
|
|
+ ctx = &card_ctx->pcm_ctx[port];
|
|
|
ret = snd_pcm_new(card, INTEL_HAD, port, MAX_PB_STREAMS,
|
|
|
MAX_CAP_STREAMS, &pcm);
|
|
|
if (ret)
|