Commit c61e9e8c authored by Mark Brown's avatar Mark Brown

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

...@@ -7,14 +7,23 @@ Required properties: ...@@ -7,14 +7,23 @@ Required properties:
required register is required register is
SRU/ADG/SSI if generation1 SRU/ADG/SSI if generation1
SRU/ADG/SSIU/SSI if generation2 SRU/ADG/SSIU/SSI if generation2
- rcar_sound,ssi : SSI subnode - rcar_sound,ssi : Should contain SSI feature.
- rcar_sound,scu : SCU subnode The number of SSI subnode should be same as HW.
- rcar_sound,dai : DAI subnode 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: SSI subnode properties:
- interrupts : Should contain SSI interrupt for PIO transfer - interrupts : Should contain SSI interrupt for PIO transfer
- shared-pin : if shared clock pin - shared-pin : if shared clock pin
SRC subnode properties:
no properties at this point
DAI subnode properties: DAI subnode properties:
- playback : list of playback modules - playback : list of playback modules
- capture : list of capture modules - capture : list of capture modules
......
...@@ -1253,7 +1253,7 @@ static int soc_post_component_init(struct snd_soc_card *card, ...@@ -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_dai_link *dai_link = NULL;
struct snd_soc_aux_dev *aux_dev = NULL; struct snd_soc_aux_dev *aux_dev = NULL;
struct snd_soc_pcm_runtime *rtd; struct snd_soc_pcm_runtime *rtd;
const char *temp, *name; const char *name;
int ret = 0; int ret = 0;
if (!dailess) { if (!dailess) {
...@@ -1267,10 +1267,6 @@ static int soc_post_component_init(struct snd_soc_card *card, ...@@ -1267,10 +1267,6 @@ static int soc_post_component_init(struct snd_soc_card *card,
} }
rtd->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 */ /* do machine specific initialization */
if (!dailess && dai_link->init) if (!dailess && dai_link->init)
ret = dai_link->init(rtd); ret = dai_link->init(rtd);
...@@ -1280,7 +1276,6 @@ static int soc_post_component_init(struct snd_soc_card *card, ...@@ -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); dev_err(card->dev, "ASoC: failed to init %s: %d\n", name, ret);
return ret; return ret;
} }
codec->name_prefix = temp;
/* register the rtd device */ /* register the rtd device */
rtd->codec = codec; rtd->codec = codec;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment