Merge remote-tracking branches 'asoc/topic/prefix' and 'asoc/topic/rcar' into asoc-next
diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
index 7c6d33f..a44e917 100644
--- a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
+++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
@@ -7,14 +7,23 @@
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 b322cf2..daca4b7 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1253,7 +1253,7 @@
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 @@
}
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 @@
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;
