Merge "ODROID-XU3/XU4 HDMI audio click noise fix." into odroidxu3-3.10.y

sound/soc/codecs/dummy_codec.c

@@ -22,7 +22,7 @@
 #define DRV_NAME	"dummy-codec"
 
 #define RATES	SNDRV_PCM_RATE_8000_192000
-#define FORMATS	(SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE)
+#define FORMATS	(SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
 
 
 static struct snd_soc_codec_driver soc_codec_dummy;

sound/soc/codecs/max98090.c

@@ -2164,7 +2164,7 @@ static struct snd_soc_dai_driver max98090_dai[] = {
 	.name = "HiFi",
 		.playback = {
 			.stream_name = "HiFi Playback",
-		.channels_min = 2,
+    		.channels_min = 1,
 			.channels_max = 2,
 			.rates = MAX98090_RATES,
 			.formats = MAX98090_FORMATS,
@@ -2177,7 +2177,7 @@ static struct snd_soc_dai_driver max98090_dai[] = {
 			.formats = MAX98090_FORMATS,
 		},
 	 .ops = &max98090_dai_ops,
-}
+    }
 };
 
 static void max98090_handle_pdata(struct snd_soc_codec *codec)

sound/soc/samsung/odroid_max98090.c

@@ -199,13 +199,15 @@ static struct snd_soc_ops odroid_ops = {
 static struct snd_soc_dai_link odroid_dai[] = {
 	{ /* Primary DAI i/f */
 		.name = "MAX98090 AIF1",
-		.stream_name = "i2s0-pri",
+		.stream_name = "i2s0-sec",
+		.cpu_dai_name = "samsung-i2s-sec",
+		.platform_name = "samsung-i2s-sec",
 		.codec_dai_name = "HiFi",
 		.ops = &odroid_ops,
+
 	}, { /* Secondary DAI i/f */
 		.name = "MAX98090 AIF2",
-		.stream_name = "i2s-sec",
-		.cpu_dai_name = "samsung-i2s-sec",
+		.stream_name = "i2s0-pri",
 		.codec_dai_name = "HiFi",
 		.ops = &odroid_ops,
 	}
@@ -254,11 +256,13 @@ static int odroid_audio_probe(struct platform_device *pdev)
 	if (ret) { // MAX98090 register failed.
         dev_err(&pdev->dev, "snd_soc_register_card() failed(max98090): %d\n", ret);
 
-	    odroid_dai[0].name="DUMMY-PRI";
-	    odroid_dai[0].codec_dai_name="dummy-aif1";
+        odroid_dai[0].name="DUMMY-SEC";
+        odroid_dai[0].stream_name = "i2s0-sec";
+        odroid_dai[0].codec_dai_name="dummy-aif1";
 
-	    odroid_dai[1].name="DUMMY-SEC";
-	    odroid_dai[1].codec_dai_name="dummy-aif2";
+        odroid_dai[1].name="DUMMY-PRI";
+        odroid_dai[1].stream_name = "i2s0-pri";
+        odroid_dai[1].codec_dai_name="dummy-aif2";
 
     	for (n = 0; np && n < ARRAY_SIZE(odroid_dai); n++) {
     		odroid_dai[n].codec_name = NULL;