Title: [8260] trunk/sound/soc/codecs: task[#5856]add AD74111 support,merge the code to ad73311
- Revision
- 8260
- Author
- cliff
- Date
- 2010-01-28 22:43:46 -0500 (Thu, 28 Jan 2010)
Log Message
task[#5856]add AD74111 support,merge the code to ad73311
Modified Paths
Diff
Modified: trunk/sound/soc/codecs/ad73311.c (8259 => 8260)
--- trunk/sound/soc/codecs/ad73311.c 2010-01-29 03:43:00 UTC (rev 8259)
+++ trunk/sound/soc/codecs/ad73311.c 2010-01-29 03:43:46 UTC (rev 8260)
@@ -20,9 +20,9 @@
#include <sound/initval.h>
#include <sound/soc.h>
-#if defined(CONFIG_SND_SOC_AD73311)
+#if CONFIG_SND_AD7XXXX_SELECT == 0
#define DRV_NAME "AD73311"
-#elif defined(CONFIG_SND_SOC_AD74111)
+#elif CONFIG_SND_AD7XXXX_SELECT == 1
#define DRV_NAME "AD74111"
#endif
Modified: trunk/sound/soc/codecs/ad73311.h (8259 => 8260)
--- trunk/sound/soc/codecs/ad73311.h 2010-01-29 03:43:00 UTC (rev 8259)
+++ trunk/sound/soc/codecs/ad73311.h 2010-01-29 03:43:46 UTC (rev 8260)
@@ -31,7 +31,7 @@
#ifndef __AD73311_H__
#define __AD73311_H__
-#if defined(CONFIG_SND_SOC_AD73311)
+#if CONFIG_SND_AD7XXXX_SELECT == 0
#define AD_CONTROL 0x8000
#define AD_DATA 0x0000
@@ -87,7 +87,7 @@
#define REGF_INV (1 << 6)
#define REGF_ALB (1 << 7)
-#elif defined(CONFIG_SND_SOC_AD74111)
+#elif CONFIG_SND_AD7XXXX_SELECT == 1
#define AD_READ 0x0000
#define AD_WRITE 0x8000
@@ -138,8 +138,7 @@
#define REGF_DAC_VOL(x) (x & 0x3F)
/* Control register G */
-#define CTRL_REG_F (6 << 11)
-#define REGF_DAC_VOL(x) (x & 0x1FF)
+#define CTRL_REG_G (6 << 11)
#endif
extern struct snd_soc_dai ad73311_dai;
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
