Title: [8663] trunk/sound/soc: Add missing header for adav80x codec driver.
- Revision
- 8663
- Author
- adamliyi
- Date
- 2010-04-23 06:06:03 -0400 (Fri, 23 Apr 2010)
Log Message
Add missing header for adav80x codec driver.
Add missing rule in makefile
Modified Paths
Added Paths
Diff
Modified: trunk/sound/soc/blackfin/Makefile (8662 => 8663)
--- trunk/sound/soc/blackfin/Makefile 2010-04-23 08:32:37 UTC (rev 8662)
+++ trunk/sound/soc/blackfin/Makefile 2010-04-23 10:06:03 UTC (rev 8663)
@@ -38,3 +38,4 @@
obj-$(CONFIG_SND_BF5XX_SOC_ADAU1361) += snd-adau1361.o
obj-$(CONFIG_SND_BF5XX_SOC_ADAU1381) += snd-adau1381.o
obj-$(CONFIG_SND_BF5XX_SOC_ADAU1373) += snd-adau1373.o
+obj-$(CONFIG_SND_BF5XX_SOC_ADAV80X) += snd-adav80x.o
Modified: trunk/sound/soc/codecs/Makefile (8662 => 8663)
--- trunk/sound/soc/codecs/Makefile 2010-04-23 08:32:37 UTC (rev 8662)
+++ trunk/sound/soc/codecs/Makefile 2010-04-23 10:06:03 UTC (rev 8663)
@@ -71,6 +71,7 @@
obj-$(CONFIG_SND_SOC_ADAU1381) += snd-soc-adau1381.o
obj-$(CONFIG_SND_SOC_ADAU1761) += snd-soc-adau1761.o
obj-$(CONFIG_SND_SOC_ADAU1373) += snd-soc-adau1373.o
+obj-$(CONFIG_SND_SOC_ADAV80X) += snd-soc-adav80x.o
obj-$(CONFIG_SND_SOC_ADS117X) += snd-soc-ads117x.o
obj-$(CONFIG_SND_SOC_AK4104) += snd-soc-ak4104.o
obj-$(CONFIG_SND_SOC_AK4535) += snd-soc-ak4535.o
Modified: trunk/sound/soc/codecs/adav80x.c (8662 => 8663)
--- trunk/sound/soc/codecs/adav80x.c 2010-04-23 08:32:37 UTC (rev 8662)
+++ trunk/sound/soc/codecs/adav80x.c 2010-04-23 10:06:03 UTC (rev 8663)
@@ -474,9 +474,7 @@
printk(KERN_ERR "Failed to register ADAV80X I2C driver: %d\n",
ret);
}
-#endif
-
-#if defined(CONFIG_SPI_MASTER)
+#elif defined(CONFIG_SPI_MASTER)
ret = spi_register_driver(&adav80x_spi_driver);
if (ret != 0) {
printk(KERN_ERR "Failed to register ADAV80X SPI driver: %d\n",
@@ -489,12 +487,10 @@
static void __exit adav80x_exit(void)
{
-#if defined(CONFIG_SPI_MASTER)
- spi_unregister_driver(&adav80x_spi_driver);
-#endif
-
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
i2c_del_driver(&adav80x_i2c_driver);
+#elif defined(CONFIG_SPI_MASTER)
+ spi_unregister_driver(&adav80x_spi_driver);
#endif
}
module_exit(adav80x_exit);
Added: trunk/sound/soc/codecs/adav80x.h (0 => 8663)
--- trunk/sound/soc/codecs/adav80x.h (rev 0)
+++ trunk/sound/soc/codecs/adav80x.h 2010-04-23 10:06:03 UTC (rev 8663)
@@ -0,0 +1,82 @@
+extern struct snd_soc_dai adav80x_dai;
+extern struct snd_soc_codec_device soc_codec_dev_adav80x;
+
+#if (CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+/* ADAV80X I2C interface requires left-shifting reg addr for 1-bit */
+#define ADAV80X_NUM_REGS (0x7E<<1)
+
+#define ADAV80X_PLAYBACK_CTRL (0x4<<1)
+#define ADAV80X_AUX_IN_CTRL (0x5<<1)
+#define ADAV80X_REC_CTRL (0x6<<1)
+#define ADAV80X_AUX_OUT_CTRL (0x7<<1)
+#define ADAV80X_GDELAY_MUTE (0x8<<1)
+
+
+#define ADAV80X_TX_CTRL (0xC<<1)
+
+#define ADAV80X_DPATH_CTRL1 (0x62<<1)
+#define ADAV80X_DPATH_CTRL2 (0x63<<1)
+#define ADAV80X_DAC_CTRL1 (0x64<<1)
+#define ADAV80X_DAC_CTRL2 (0x65<<1)
+#define ADAV80X_DAC_CTRL3 (0x66<<1)
+#define ADAV80X_DAC_CTRL4 (0x67<<1)
+#define ADAV80X_DAC_L_VOL (0x68<<1)
+#define ADAV80X_DAC_R_VOL (0x69<<1)
+#define ADAV80X_DAC_L_PEAK_VOL (0x6A<<1)
+#define ADAV80X_DAC_R_PEAK_VOL (0x6B<<1)
+
+
+#define ADAV80X_ADC_CTRL1 (0x6E<<1)
+#define ADAV80X_ADC_CTRL2 (0x6F<<1)
+#define ADAV80X_ADC_L_VOL (0x70<<1)
+#define ADAV80X_ADC_R_VOL (0x71<<1)
+#define ADAV80X_ADC_L_PEAK_VOL (0x72<<1)
+#define ADAV80X_ADC_R_PEAK_VOL (0x73<<1)
+#define ADAV80X_PLL_CTRL1 (0x74<<1)
+#define ADAV80X_PLL_CTRL2 (0x75<<1)
+#define ADAV80X_ICLK_CTRL1 (0x76<<1)
+#define ADAV80X_ICLK_CTRL2 (0x77<<1)
+
+#define ADAV80X_PLL_OUTE (0x7A<<1)
+#define ADAV80X_ALC_CTRL1 (0x7B<<1)
+
+#elif defined(CONFIG_SPI_MASTER)
+/* from 0x0 to 0x7D */
+#define ADAV80X_NUM_REGS 0x7E
+
+#define ADAV80X_PLAYBACK_CTRL 0x4
+#define ADAV80X_AUX_IN_CTRL 0x5
+#define ADAV80X_REC_CTRL 0x6
+#define ADAV80X_AUX_OUT_CTRL 0x7
+#define ADAV80X_GDELAY_MUTE 0x8
+
+
+#define ADAV80X_TX_CTRL 0xC
+
+#define ADAV80X_DPATH_CTRL1 0x62
+#define ADAV80X_DPATH_CTRL2 0x63
+#define ADAV80X_DAC_CTRL1 0x64
+#define ADAV80X_DAC_CTRL2 0x65
+#define ADAV80X_DAC_CTRL3 0x66
+#define ADAV80X_DAC_CTRL4 0x67
+#define ADAV80X_DAC_L_VOL 0x68
+#define ADAV80X_DAC_R_VOL 0x69
+#define ADAV80X_DAC_L_PEAK_VOL 0x6A
+#define ADAV80X_DAC_R_PEAK_VOL 0x6B
+
+
+#define ADAV80X_ADC_CTRL1 0x6E
+#define ADAV80X_ADC_CTRL2 0x6F
+#define ADAV80X_ADC_L_VOL 0x70
+#define ADAV80X_ADC_R_VOL 0x71
+#define ADAV80X_ADC_L_PEAK_VOL 0x72
+#define ADAV80X_ADC_R_PEAK_VOL 0x73
+#define ADAV80X_PLL_CTRL1 0x74
+#define ADAV80X_PLL_CTRL2 0x75
+#define ADAV80X_ICLK_CTRL1 0x76
+#define ADAV80X_ICLK_CTRL2 0x77
+
+#define ADAV80X_PLL_OUTE 0x7A
+#define ADAV80X_ALC_CTRL1 0x7B
+
+#endif
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
