Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sh', 'asoc/topic...

diff --combined sound/soc/sti/uniperif_player.c
index 5c2bc53f0a9b721fd6a2f0b285c4d782d76d5bd6,843f037a317da31aecc0b1761ddde2dfa24a1334,843f037a317da31aecc0b1761ddde2dfa24a1334,843f037a317da31aecc0b1761ddde2dfa24a1334,148bcd7dbf031fd89003700ac98a2fb91b0d0750..7aca6b92f71863a41b33f9b9ff6dada0977daf47
--- 1/sound/soc/sti/uniperif_player.c
--- 2/sound/soc/sti/uniperif_player.c
--- 3/sound/soc/sti/uniperif_player.c
--- 4/sound/soc/sti/uniperif_player.c
--- 5/sound/soc/sti/uniperif_player.c
+++ b/sound/soc/sti/uniperif_player.c
@@@@@@ -251,8 -251,8 -251,8 -251,8 -251,7 +251,7 @@@@@@ static void uni_player_set_channel_stat
         * set one.
         */
        mutex_lock(&player->ctrl_lock);
----    if (runtime && (player->stream_settings.iec958.status[3]
----                                    == IEC958_AES3_CON_FS_NOTID)) {
++++    if (runtime) {
                switch (runtime->rate) {
                case 22050:
                        player->stream_settings.iec958.status[3] =
@@@@@@ -669,7 -669,6 -669,6 -669,6 -668,6 +668,7 @@@@@@ static int uni_player_startup(struct sn
     {
        struct sti_uniperiph_data *priv = snd_soc_dai_get_drvdata(dai);
        struct uniperif *player = priv->dai_data.uni;
 ++++   player->substream = substream;
     
        player->clk_adj = 0;
     
@@@@@@ -951,8 -950,6 -950,6 -950,6 -949,6 +950,8 @@@@@@ static void uni_player_shutdown(struct 
        if (player->state != UNIPERIF_STATE_STOPPED)
                /* Stop the player */
                uni_player_stop(player);
 ++++
 ++++   player->substream = NULL;
     }
     
     static int uni_player_parse_dt_clk_glue(struct platform_device *pdev,
@@@@@@ -992,7 -989,7 -989,7 -989,7 -988,7 +991,7 @@@@@@ static int uni_player_parse_dt(struct p
        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;
@@@@@@ -1001,13 -998,13 -998,13 -998,13 -997,13 +1000,13 @@@@@@
        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;
        }