Title: [8261] trunk/sound/soc/blackfin: task[#5856]add an item to distinguish AD73311 from AD74411
- Revision
- 8261
- Author
- cliff
- Date
- 2010-01-28 22:46:31 -0500 (Thu, 28 Jan 2010)
Log Message
task[#5856]add an item to distinguish AD73311 from AD74411
Modified Paths
Diff
Modified: trunk/sound/soc/blackfin/Kconfig (8260 => 8261)
--- trunk/sound/soc/blackfin/Kconfig 2010-01-29 03:43:46 UTC (rev 8260)
+++ trunk/sound/soc/blackfin/Kconfig 2010-01-29 03:46:31 UTC (rev 8261)
@@ -18,13 +18,20 @@
Say Y if you want to add support for SoC audio on BF527-EZKIT.
config SND_BF5XX_SOC_AD73311
- tristate "SoC AD73311\AD74111 Audio support for Blackfin"
+ tristate "SoC AD73311/AD74111 Audio support for Blackfin"
depends on SND_BF5XX_I2S
select SND_BF5XX_SOC_I2S
select SND_SOC_AD73311
help
Say Y if you want to add support for AD73311 codec on Blackfin.
+config SND_AD7XXXX_SELECT
+ int "Select AD73311 or AD74111"
+ depends on SND_SOC_AD73311
+ default 0
+ help
+ Set "0" to select AD73311, "1" for AD74111.
+
config SND_BF5XX_SOC_ADAU1371
tristate "SoC ADAU1371 Audio support"
depends on SND_BF5XX_I2S
Modified: trunk/sound/soc/blackfin/bf5xx-ad73311.c (8260 => 8261)
--- trunk/sound/soc/blackfin/bf5xx-ad73311.c 2010-01-29 03:43:46 UTC (rev 8260)
+++ trunk/sound/soc/blackfin/bf5xx-ad73311.c 2010-01-29 03:46:31 UTC (rev 8261)
@@ -81,7 +81,7 @@
unsigned short ctrl_regs[7];
unsigned short status = 0;
int count = 0;
-#if defined(CONFIG_SND_SOC_AD73311)
+#if CONFIG_SND_AD7XXXX_SELECT == 0
/* DMCLK = MCLK = 16.384 MHz
* SCLK = DMCLK/8 = 2.048 MHz
* Sample Rate = DMCLK/2048 = 8 KHz
@@ -95,7 +95,7 @@
ctrl_regs[3] = AD_CONTROL | AD_WRITE | CTRL_REG_E | REGE_DA(0x1f);
ctrl_regs[4] = AD_CONTROL | AD_WRITE | CTRL_REG_F | REGF_SEEN ;
ctrl_regs[5] = AD_CONTROL | AD_WRITE | CTRL_REG_A | REGA_MODE_DATA;
-#elif defined(CONFIG_SND_SOC_AD74111)
+#elif CONFIG_SND_AD7XXXX_SELECT == 1
/* MCLK = MCLK = 12.288 MHz
* Sample Rate = 8 KHz
* IMCLK = MCLK/6 = 2.048 MHz = 8kHz * 256
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
