From: Lee Jones <lee.jones@linaro.org>
To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: linus.walleij@linaro.org, Lee Jones <lee.jones@linaro.org>,
alsa-devel@alsa-project.org, Mark Brown <broonie@kernel.org>
Subject: [PATCH 07/13] ASoC: ux500_pcm: Extract MSP IDs from Device Tree
Date: Wed, 6 Nov 2013 10:16:19 +0000 [thread overview]
Message-ID: <1383732985-18928-8-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1383732985-18928-1-git-send-email-lee.jones@linaro.org>
This is required for indexing pre-defined channel configuration structures.
Cc: alsa-devel@alsa-project.org
Cc: Mark Brown <broonie@kernel.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
sound/soc/ux500/ux500_msp_i2s.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c
index 1ca8b08..0a99372 100644
--- a/sound/soc/ux500/ux500_msp_i2s.c
+++ b/sound/soc/ux500/ux500_msp_i2s.c
@@ -665,6 +665,13 @@ int ux500_msp_i2s_init_msp(struct platform_device *pdev,
sizeof(struct msp_i2s_platform_data), GFP_KERNEL);
if (!platform_data)
return -ENOMEM;
+
+ if (!of_property_read_u32(np, "id",
+ &platform_data->id)) {
+ dev_err(&pdev->dev,
+ "No 'id' property found in DT\n");
+ return -EINVAL;
+ }
}
} else
if (!platform_data)
--
1.8.1.2
next prev parent reply other threads:[~2013-11-06 10:16 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-06 10:16 [PATCH 00/13] ASoC: dma: ARM: ux500: Obtain DMA data from Device Tree Lee Jones
2013-11-06 10:16 ` Lee Jones [this message]
2013-11-06 11:46 ` [PATCH 07/13] ASoC: ux500_pcm: Extract MSP IDs " Linus Walleij
2013-11-06 10:16 ` [PATCH 08/13] ASoC: generic-dmaengine-pcm: Clear slave_config memory Lee Jones
2013-11-06 11:55 ` [alsa-devel] " Lars-Peter Clausen
2013-11-07 11:36 ` Mark Brown
2013-11-06 10:16 ` [PATCH 09/13] ASoC: Ux500: Match platform by device node when booting Device Tree Lee Jones
2013-11-06 11:47 ` Linus Walleij
2013-11-06 10:16 ` [PATCH 10/13] ASoC: ux500_pcm: Extend Device Tree support to deal with DMA data Lee Jones
2013-11-06 11:49 ` Linus Walleij
2013-11-06 10:16 ` [PATCH 11/13] ASoC: ux500: Store DMA data in the DAI differently in the pdata and DT case Lee Jones
2013-11-06 11:50 ` Linus Walleij
2013-11-06 10:16 ` [PATCH 12/13] ASoC: ux500_pcm: Differentiate between pdata and DT initialisation Lee Jones
2013-11-06 11:51 ` Linus Walleij
2013-11-06 10:16 ` [PATCH 13/13] ASoC: ux500_pcm: Take out pointless dev_dbg() call Lee Jones
2013-11-06 11:52 ` Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1383732985-18928-8-git-send-email-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).