From: Moise Gergaud <moise.gergaud@st.com>
To: arnaud.pouliquen@st.com, alsa-devel@alsa-project.org,
broonie@kernel.org, lgirdwood@gmail.com, tiwai@suse.de
Cc: Moise Gergaud <moise.gergaud@st.com>
Subject: [PATCH 2/4] ASoC: sti: rename ST proprietary DT properties
Date: Thu, 19 Nov 2015 14:54:08 +0100 [thread overview]
Message-ID: <1447941250-344-3-git-send-email-moise.gergaud@st.com> (raw)
In-Reply-To: <1447941250-344-1-git-send-email-moise.gergaud@st.com>
"st," prefix has been added for ST proprietary DT properties.
Signed-off-by: Moise Gergaud <moise.gergaud@st.com>
Acked-by: Arnaud Pouliquen <arnaud.pouliquen@st.com>
---
sound/soc/sti/uniperif_player.c | 6 +++---
sound/soc/sti/uniperif_reader.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/soc/sti/uniperif_player.c b/sound/soc/sti/uniperif_player.c
index 843f037..1e19a7c 100644
--- a/sound/soc/sti/uniperif_player.c
+++ b/sound/soc/sti/uniperif_player.c
@@ -989,7 +989,7 @@ static int uni_player_parse_dt(struct platform_device *pdev,
if (!info)
return -ENOMEM;
- if (of_property_read_u32(pnode, "version", &player->ver) ||
+ if (of_property_read_u32(pnode, "st,version", &player->ver) ||
player->ver == SND_ST_UNIPERIF_VERSION_UNKNOWN) {
dev_err(dev, "Unknown uniperipheral version ");
return -EINVAL;
@@ -998,13 +998,13 @@ static int uni_player_parse_dt(struct platform_device *pdev,
if (player->ver >= SND_ST_UNIPERIF_VERSION_UNI_PLR_TOP_1_0)
info->underflow_enabled = 1;
- if (of_property_read_u32(pnode, "uniperiph-id", &info->id)) {
+ if (of_property_read_u32(pnode, "st,uniperiph-id", &info->id)) {
dev_err(dev, "uniperipheral id not defined");
return -EINVAL;
}
/* Read the device mode property */
- if (of_property_read_string(pnode, "mode", &mode)) {
+ if (of_property_read_string(pnode, "st,mode", &mode)) {
dev_err(dev, "uniperipheral mode not defined");
return -EINVAL;
}
diff --git a/sound/soc/sti/uniperif_reader.c b/sound/soc/sti/uniperif_reader.c
index 819eeaf..8a0eb20 100644
--- a/sound/soc/sti/uniperif_reader.c
+++ b/sound/soc/sti/uniperif_reader.c
@@ -316,7 +316,7 @@ static int uni_reader_parse_dt(struct platform_device *pdev,
if (!info)
return -ENOMEM;
- if (of_property_read_u32(node, "version", &reader->ver) ||
+ if (of_property_read_u32(node, "st,version", &reader->ver) ||
reader->ver == SND_ST_UNIPERIF_VERSION_UNKNOWN) {
dev_err(&pdev->dev, "Unknown uniperipheral version ");
return -EINVAL;
--
1.9.1
next prev parent reply other threads:[~2015-11-19 13:54 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-19 13:54 [PATCH 0/4] ASoC sti: corrections Moise Gergaud
2015-11-19 13:54 ` [PATCH 1/4] ASoC: sti: remove wrong error message Moise Gergaud
2015-11-19 19:56 ` Applied "ASoC: sti: remove wrong error message" to the asoc tree Mark Brown
2015-11-19 13:54 ` Moise Gergaud [this message]
2015-11-19 19:56 ` Applied "ASoC: sti: rename ST proprietary DT properties" " Mark Brown
2015-11-19 13:54 ` [PATCH 3/4] ASoC: sti: set player private data Moise Gergaud
2015-11-19 19:56 ` Applied "ASoC: sti: set player private data" to the asoc tree Mark Brown
2015-11-19 13:54 ` [PATCH 4/4] ASoC: sti: reset iec60958 settings on close Moise Gergaud
2015-11-19 17:50 ` Mark Brown
2015-11-20 9:11 ` Moise Gergaud
2015-11-21 12:45 ` Mark Brown
2015-11-23 8:50 ` Moise Gergaud
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=1447941250-344-3-git-send-email-moise.gergaud@st.com \
--to=moise.gergaud@st.com \
--cc=alsa-devel@alsa-project.org \
--cc=arnaud.pouliquen@st.com \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=tiwai@suse.de \
/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).