Merge remote-tracking branches 'asoc/topic/prefix' and 'asoc/topic/rcar' into asoc...

diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
index 7c6d33f297968d656ac82bfd7fb26da12cc6f2e1..a44e9179faf569c7d8f40ab317381d2728398f99 100644 (file)
--- a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
+++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
@@ -7,14 +7,23 @@ Required properties:
                                  required register is
                                   SRU/ADG/SSI      if generation1
                                   SRU/ADG/SSIU/SSI if generation2
-- rcar_sound,ssi               : SSI subnode
-- rcar_sound,scu               : SCU subnode
-- rcar_sound,dai               : DAI subnode
+- rcar_sound,ssi               : Should contain SSI feature.
+                                 The number of SSI subnode should be same as HW.
+                                 see below for detail.
+- rcar_sound,src               : Should contain SRC feature.
+                                 The number of SRC subnode should be same as HW.
+                                 see below for detail.
+- rcar_sound,dai               : DAI contents.
+                                 The number of DAI subnode should be same as HW.
+                                 see below for detail.
 
 SSI subnode properties:
 - interrupts                   : Should contain SSI interrupt for PIO transfer
 - shared-pin                   : if shared clock pin
 
+SRC subnode properties:
+no properties at this point
+
 DAI subnode properties:
 - playback                     : list of playback modules
 - capture                      : list of capture  modules

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index b322cf294d0659ec60b4b1bd70b0f63f3bbdf77e..daca4b7de45cf27fd47dbfff91a59453340943ed 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1253,7 +1253,7 @@ static int soc_post_component_init(struct snd_soc_card *card,
        struct snd_soc_dai_link *dai_link = NULL;
        struct snd_soc_aux_dev *aux_dev = NULL;
        struct snd_soc_pcm_runtime *rtd;
-       const char *temp, *name;
+       const char *name;
        int ret = 0;
 
        if (!dailess) {
@@ -1267,10 +1267,6 @@ static int soc_post_component_init(struct snd_soc_card *card,
        }
        rtd->card = card;
 
-       /* machine controls, routes and widgets are not prefixed */
-       temp = codec->name_prefix;
-       codec->name_prefix = NULL;
-
        /* do machine specific initialization */
        if (!dailess && dai_link->init)
                ret = dai_link->init(rtd);
@@ -1280,7 +1276,6 @@ static int soc_post_component_init(struct snd_soc_card *card,
                dev_err(card->dev, "ASoC: failed to init %s: %d\n", name, ret);
                return ret;
        }
-       codec->name_prefix = temp;
 
        /* register the rtd device */
        rtd->codec = codec;