ASoC: codecs: max98090: correct DMIC names
Naveen Kumar S [Wed, 9 Apr 2014 11:07:39 +0000 (16:07 +0530)]
DMIC1 and DIMC2 were renamed to DMICL and DMICR respectively.
Hence correcting the names accordingly.

bug 1457229

Change-Id: Iecff0cabb18743a8d399965fab320ac3683f622a
Signed-off-by: Naveen Kumar S <nkumars@nvidia.com>
Reviewed-on: http://git-master/r/394109
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Matthew Pedro <mapedro@nvidia.com>
Tested-by: Matthew Pedro <mapedro@nvidia.com>

sound/soc/codecs/max98090.c

index e40d678..611fed8 100644 (file)
@@ -2,6 +2,7 @@
  * max98090.c -- MAX98090 ALSA SoC Audio driver
  *
  * Copyright 2011-2012 Maxim Integrated Products
+ * Copyright (c) 2011-2014, NVIDIA CORPORATION. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -2779,8 +2780,8 @@ static void max98090_jack_work(struct work_struct *work)
                        snd_soc_dapm_force_enable_pin(&codec->dapm, "SPKR");
                        snd_soc_dapm_disable_pin(&codec->dapm, "MIC1");
                        snd_soc_dapm_disable_pin(&codec->dapm, "MIC2");
-                       snd_soc_dapm_force_enable_pin(&codec->dapm, "DMIC1");
-                       snd_soc_dapm_force_enable_pin(&codec->dapm, "DMIC2");
+                       snd_soc_dapm_force_enable_pin(&codec->dapm, "DMICL");
+                       snd_soc_dapm_force_enable_pin(&codec->dapm, "DMICR");
                        max98090_dmic_switch(codec, 1);
 
                        break;
@@ -2814,8 +2815,8 @@ static void max98090_jack_work(struct work_struct *work)
                        snd_soc_dapm_force_enable_pin(&codec->dapm, "HPR");
                        snd_soc_dapm_disable_pin(&codec->dapm, "MIC1");
                        snd_soc_dapm_disable_pin(&codec->dapm, "MIC2");
-                       snd_soc_dapm_force_enable_pin(&codec->dapm, "DMIC1");
-                       snd_soc_dapm_force_enable_pin(&codec->dapm, "DMIC2");
+                       snd_soc_dapm_force_enable_pin(&codec->dapm, "DMICL");
+                       snd_soc_dapm_force_enable_pin(&codec->dapm, "DMICR");
                        max98090_dmic_switch(codec, 1);
 
                        break;
@@ -2833,8 +2834,8 @@ static void max98090_jack_work(struct work_struct *work)
                        snd_soc_dapm_disable_pin(&codec->dapm, "SPKR");
                        snd_soc_dapm_force_enable_pin(&codec->dapm, "HPL");
                        snd_soc_dapm_force_enable_pin(&codec->dapm, "HPR");
-                       snd_soc_dapm_disable_pin(&codec->dapm, "DMIC1");
-                       snd_soc_dapm_disable_pin(&codec->dapm, "DMIC2");
+                       snd_soc_dapm_disable_pin(&codec->dapm, "DMICL");
+                       snd_soc_dapm_disable_pin(&codec->dapm, "DMICR");
                        snd_soc_dapm_force_enable_pin(&codec->dapm, "MIC1");
                        snd_soc_dapm_force_enable_pin(&codec->dapm, "MIC2");
                        max98090_dmic_switch(codec, 0);