ASoC: arizona: Attach SYSCLK to DSP preloaders

Currently SYSCLK is attached to every compressed DAI as this follows the
pattern of attaching clocks to the chips inputs and outputs, however, it is
really the DSP that requires the clock here. As firmware download can be a
significant part of the path startup time for these devices occasionally it
would be desirable to download the firmware in advance of the path being
brought up.

To help facilitate this early firmware loading this patch attaches the
SYSCLK to the DSP preloader widget. This also saves us adding a new route
to SYSCLK every time a new compressed DAI is created.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/arizona.h b/sound/soc/codecs/arizona.h
index 69da1ef..e49955d 100644 (file)
--- a/sound/soc/codecs/arizona.h
+++ b/sound/soc/codecs/arizona.h
@@ -190,6 +190,7 @@ extern unsigned int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS];
 
 #define ARIZONA_DSP_ROUTES(name) \
        { name, NULL, name " Preloader"}, \
+       { name " Preloader", NULL, "SYSCLK" }, \
        { name " Preloader", NULL, name " Aux 1" }, \
        { name " Preloader", NULL, name " Aux 2" }, \
        { name " Preloader", NULL, name " Aux 3" }, \

diff --git a/sound/soc/codecs/cs47l24.c b/sound/soc/codecs/cs47l24.c
index f8d8139..9576dbd 100644 (file)
--- a/sound/soc/codecs/cs47l24.c
+++ b/sound/soc/codecs/cs47l24.c
@@ -814,7 +814,6 @@ static const struct snd_soc_dapm_route cs47l24_dapm_routes[] = {
        { "AIF3 Capture", NULL, "SYSCLK" },
 
        { "Voice Control DSP", NULL, "DSP3" },
-       { "Voice Control DSP", NULL, "SYSCLK" },
 
        { "IN1L PGA", NULL, "IN1L" },
        { "IN1R PGA", NULL, "IN1R" },
@@ -823,7 +822,6 @@ static const struct snd_soc_dapm_route cs47l24_dapm_routes[] = {
        { "IN2R PGA", NULL, "IN2R" },
 
        { "Audio Trace DSP", NULL, "DSP2" },
-       { "Audio Trace DSP", NULL, "SYSCLK" },
 
        ARIZONA_MIXER_ROUTES("OUT1L", "HPOUT1L"),
        ARIZONA_MIXER_ROUTES("OUT1R", "HPOUT1R"),

diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
index 16a1c5b..8ce7680 100644 (file)
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@ -1610,7 +1610,6 @@ static const struct snd_soc_dapm_route wm5102_dapm_routes[] = {
        { "Slim3 Capture", NULL, "SYSCLK" },
 
        { "Audio Trace DSP", NULL, "DSP1" },
-       { "Audio Trace DSP", NULL, "SYSCLK" },
 
        { "IN1L PGA", NULL, "IN1L" },
        { "IN1R PGA", NULL, "IN1R" },

diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index 673dc59..5d8c5b6 100644 (file)
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -1842,10 +1842,8 @@ static const struct snd_soc_dapm_route wm5110_dapm_routes[] = {
        { "Slim3 Capture", NULL, "SYSCLK" },
 
        { "Voice Control DSP", NULL, "DSP3" },
-       { "Voice Control DSP", NULL, "SYSCLK" },
 
        { "Audio Trace DSP", NULL, "DSP1" },
-       { "Audio Trace DSP", NULL, "SYSCLK" },
 
        { "IN1L PGA", NULL, "IN1L" },
        { "IN1R PGA", NULL, "IN1R" },