ASoC: cs47l85: Fix up dapm clock routing
authorStuart Henderson <stuarth@opensource.cirrus.com>
Mon, 29 Jan 2018 16:18:27 +0000 (16:18 +0000)
committer강신형 <s47.kang@samsung.com>
Tue, 19 Jun 2018 07:53:06 +0000 (16:53 +0900)
Change-Id: I699a0db068f2abf58dc4d8c362b0144f1fde5f61
Signed-off-by: Stuart Henderson <stuarth@opensource.cirrus.com>
sound/soc/codecs/cs47l85.c

index c32e21b3aaccd653fff2e0d383e9e9be8d504bcc..86c8a1ef406f804e456c459d6cad7c14a27c457e 100644 (file)
@@ -859,6 +859,22 @@ SND_SOC_DAPM_SUPPLY("ISRC2INTCLK", SND_SOC_NOPM,
                    MADERA_DOM_GRP_ISRC2_INT, 0,
                    madera_domain_clk_ev,
                    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
+SND_SOC_DAPM_SUPPLY("ISRC3DECCLK", SND_SOC_NOPM,
+                   MADERA_DOM_GRP_ISRC3_DEC, 0,
+                   madera_domain_clk_ev,
+                   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
+SND_SOC_DAPM_SUPPLY("ISRC3INTCLK", SND_SOC_NOPM,
+                   MADERA_DOM_GRP_ISRC3_INT, 0,
+                   madera_domain_clk_ev,
+                   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
+SND_SOC_DAPM_SUPPLY("ISRC4DECCLK", SND_SOC_NOPM,
+                   MADERA_DOM_GRP_ISRC4_DEC, 0,
+                   madera_domain_clk_ev,
+                   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
+SND_SOC_DAPM_SUPPLY("ISRC4INTCLK", SND_SOC_NOPM,
+                   MADERA_DOM_GRP_ISRC4_INT, 0,
+                   madera_domain_clk_ev,
+                   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 SND_SOC_DAPM_SUPPLY("OUTCLK", SND_SOC_NOPM,
                    MADERA_DOM_GRP_OUT, 0,
                    madera_domain_clk_ev,
@@ -1714,8 +1730,8 @@ static const struct snd_soc_dapm_route cs47l85_dapm_routes[] = {
        { "AIF2TX8", NULL, "AIF2TXCLK" },
        { "AIF3TX1", NULL, "AIF3TXCLK" },
        { "AIF3TX2", NULL, "AIF3TXCLK" },
-       { "AIF4TX1", NULL, "AIF3TXCLK" },
-       { "AIF4TX2", NULL, "AIF3TXCLK" },
+       { "AIF4TX1", NULL, "AIF4TXCLK" },
+       { "AIF4TX2", NULL, "AIF4TXCLK" },
        { "SLIMTX1", NULL, "SLIMBUSCLK" },
        { "SLIMTX2", NULL, "SLIMBUSCLK" },
        { "SLIMTX3", NULL, "SLIMBUSCLK" },
@@ -1749,22 +1765,22 @@ static const struct snd_soc_dapm_route cs47l85_dapm_routes[] = {
        { "ISRC2INT2", NULL, "ISRC2INTCLK" },
        { "ISRC2INT3", NULL, "ISRC2INTCLK" },
        { "ISRC2INT4", NULL, "ISRC2INTCLK" },
-       { "ISRC3DEC1", NULL, "ISRC1DECCLK" },
-       { "ISRC3DEC2", NULL, "ISRC1DECCLK" },
-       { "ISRC3INT1", NULL, "ISRC1INTCLK" },
-       { "ISRC3INT2", NULL, "ISRC1INTCLK" },
-       { "ISRC4DEC1", NULL, "ISRC1DECCLK" },
-       { "ISRC4DEC2", NULL, "ISRC1DECCLK" },
-       { "ISRC4INT1", NULL, "ISRC1INTCLK" },
-       { "ISRC4INT2", NULL, "ISRC1INTCLK" },
+       { "ISRC3DEC1", NULL, "ISRC3DECCLK" },
+       { "ISRC3DEC2", NULL, "ISRC3DECCLK" },
+       { "ISRC3INT1", NULL, "ISRC3INTCLK" },
+       { "ISRC3INT2", NULL, "ISRC3INTCLK" },
+       { "ISRC4DEC1", NULL, "ISRC4DECCLK" },
+       { "ISRC4DEC2", NULL, "ISRC4DECCLK" },
+       { "ISRC4INT1", NULL, "ISRC4INTCLK" },
+       { "ISRC4INT2", NULL, "ISRC4INTCLK" },
        { "ASRC1IN1L", NULL, "ASRC1R1CLK" },
        { "ASRC1IN1R", NULL, "ASRC1R1CLK" },
        { "ASRC1IN2L", NULL, "ASRC1R2CLK" },
-       { "ASRC1IN2L", NULL, "ASRC1R2CLK" },
+       { "ASRC1IN2R", NULL, "ASRC1R2CLK" },
        { "ASRC2IN1L", NULL, "ASRC2R1CLK" },
        { "ASRC2IN1R", NULL, "ASRC2R1CLK" },
        { "ASRC2IN2L", NULL, "ASRC2R2CLK" },
-       { "ASRC2IN2L", NULL, "ASRC2R2CLK" },
+       { "ASRC2IN2R", NULL, "ASRC2R2CLK" },
 
        { "AIF2 Capture", NULL, "DBVDD2" },
        { "AIF2 Playback", NULL, "DBVDD2" },