FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-23 18:07:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASoC: sti: rename ST proprietary DT properties

Browse Source 
"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>
This commit is contained in:
Moise Gergaud 2015-11-19 14:54:08 +01:00 committed by Mark Brown
parent cd3ed08a86
commit f9f51973d3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/soc/sti/uniperif_player.c
View File

@ -989,7 +989,7 @@ static int uni_player_parse_dt(struct platform_device *pdev,
if (!info) if (!info)
return -ENOMEM; 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) { player->ver == SND_ST_UNIPERIF_VERSION_UNKNOWN) {
dev_err(dev, "Unknown uniperipheral version "); dev_err(dev, "Unknown uniperipheral version ");
return -EINVAL; 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) if (player->ver >= SND_ST_UNIPERIF_VERSION_UNI_PLR_TOP_1_0)
info->underflow_enabled = 1; 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"); dev_err(dev, "uniperipheral id not defined");
return -EINVAL; return -EINVAL;
} }
/* Read the device mode property */ /* 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"); dev_err(dev, "uniperipheral mode not defined");
return -EINVAL; return -EINVAL;
} }

2
sound/soc/sti/uniperif_reader.c
View File

@ -316,7 +316,7 @@ static int uni_reader_parse_dt(struct platform_device *pdev,
if (!info) if (!info)
return -ENOMEM; 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) { reader->ver == SND_ST_UNIPERIF_VERSION_UNKNOWN) {
dev_err(&pdev->dev, "Unknown uniperipheral version "); dev_err(&pdev->dev, "Unknown uniperipheral version ");
return -EINVAL; return -EINVAL;