summaryrefslogtreecommitdiffstats
path: root/sound/soc/sti/uniperif_player.c
diff options
context:
space:
mode:
authorMoise Gergaud2015-11-19 14:54:08 +0100
committerMark Brown2015-11-19 18:49:35 +0100
commitf9f51973d3a8559731a228e91ac29792b43046a5 (patch)
tree3dce940a484d9cd520ac81a5f87639e7cf2c9728 /sound/soc/sti/uniperif_player.c
parentASoC: sti: remove wrong error message (diff)
downloadkernel-qcow2-linux-f9f51973d3a8559731a228e91ac29792b43046a5.tar.gz
kernel-qcow2-linux-f9f51973d3a8559731a228e91ac29792b43046a5.tar.xz
kernel-qcow2-linux-f9f51973d3a8559731a228e91ac29792b43046a5.zip
ASoC: sti: rename ST proprietary DT properties
"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> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sti/uniperif_player.c')
-rw-r--r--sound/soc/sti/uniperif_player.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/sti/uniperif_player.c b/sound/soc/sti/uniperif_player.c
index 843f037a317d..1e19a7c6b7e8 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;
}