Title: [8891] trunk/sound/soc/codecs: bug[#6026]two purposes 1.only shundow codec once 2.clean up code
- Revision
- 8891
- Author
- cliff
- Date
- 2010-06-06 23:14:07 -0400 (Sun, 06 Jun 2010)
Log Message
bug[#6026]two purposes 1.only shundow codec once 2.clean up code
Modified Paths
Diff
Modified: trunk/sound/soc/codecs/adau1361.c (8890 => 8891)
--- trunk/sound/soc/codecs/adau1361.c 2010-06-07 02:45:48 UTC (rev 8890)
+++ trunk/sound/soc/codecs/adau1361.c 2010-06-07 03:14:07 UTC (rev 8891)
@@ -31,7 +31,6 @@
#define CAP_MIC 1
#define CAP_LINE 2
#define CAPTURE_SOURCE_NUMBER 2
-#define ADAU1361_DIG_MIC 0
struct snd_soc_codec_device soc_codec_dev_adau1361;
static struct snd_soc_codec *adau1361_codec;
@@ -588,9 +587,10 @@
struct snd_soc_codec *codec = socdev->card->codec;
u8 reg;
- reg = snd_soc_read(codec, ADAU_CLKCTRL);
- snd_soc_write(codec, ADAU_CLKCTRL, reg & ~0x1);
-
+ if (!codec->active) {
+ reg = snd_soc_read(codec, ADAU_CLKCTRL);
+ snd_soc_write(codec, ADAU_CLKCTRL, reg & ~0x1);
+ }
}
static int adau1361_set_dai_fmt(struct snd_soc_dai *codec_dai,
Modified: trunk/sound/soc/codecs/adau1361.h (8890 => 8891)
--- trunk/sound/soc/codecs/adau1361.h 2010-06-07 02:45:48 UTC (rev 8890)
+++ trunk/sound/soc/codecs/adau1361.h 2010-06-07 03:14:07 UTC (rev 8891)
@@ -230,8 +230,8 @@
{ADAU_PLBLOVR, 0x02},
{ADAU_PLBMNOC, 0xE5},
/*analog mic*/
- {ADAU_RECVLCL, 0x82},
- {ADAU_RECVLCR, 0x82},
+ {ADAU_RECVLCL, 0x42},
+ {ADAU_RECVLCR, 0x42},
{ADAU_MICCTRL, 0x00},
};
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits