Title: [9063] trunk/sound/soc: asoc: keep codecs sorted
- Revision
- 9063
- Author
- vapier
- Date
- 2010-08-07 03:05:18 -0400 (Sat, 07 Aug 2010)
Log Message
asoc: keep codecs sorted
Modified Paths
Diff
Modified: trunk/sound/soc/blackfin/Kconfig (9062 => 9063)
--- trunk/sound/soc/blackfin/Kconfig 2010-08-07 05:07:45 UTC (rev 9062)
+++ trunk/sound/soc/blackfin/Kconfig 2010-08-07 07:05:18 UTC (rev 9063)
@@ -25,6 +25,14 @@
help
Say Y if you want to add support for AD73311 codec on Blackfin.
+config SND_BFIN_AD73311_SE
+ int "PF pin for AD73311L Chip Select"
+ depends on SND_BF5XX_SOC_AD73311
+ default 4
+ help
+ Enter the GPIO used to control AD73311's SE pin. Acceptable
+ values are 0 to 7
+
config SND_AD7XXXX_SELECT
int "Select AD73311 or AD74111"
depends on SND_SOC_AD73311
@@ -32,32 +40,32 @@
help
Set "0" to select AD73311, "1" for AD74111.
-config SND_BF5XX_SOC_ADAU1371
- tristate "SoC ADAU1371 Audio support"
+config SND_BF5XX_SOC_ADAU1361
+ tristate "SoC ADAU1361 Audio support"
depends on SND_BF5XX_I2S
select SND_BF5XX_SOC_I2S
- select SND_SOC_ADAU1371
+ select SND_SOC_ADAU1361
select I2C
help
- Say Y if you want to add support for ADAU1371 SoC audio.
+ Say Y if you want to add support for ADAU1361 SoC audio.
-config SND_BF5XX_SOC_ADAU1761
- tristate "SoC ADAU1761 Audio support"
+config SND_BF5XX_SOC_ADAU1371
+ tristate "SoC ADAU1371 Audio support"
depends on SND_BF5XX_I2S
select SND_BF5XX_SOC_I2S
- select SND_SOC_ADAU1761
+ select SND_SOC_ADAU1371
select I2C
help
- Say Y if you want to add support for ADAU1761 SoC audio.
+ Say Y if you want to add support for ADAU1371 SoC audio.
-config SND_BF5XX_SOC_ADAU1361
- tristate "SoC ADAU1361 Audio support"
+config SND_BF5XX_SOC_ADAU1373
+ tristate "SoC ADAU1373 Audio support"
depends on SND_BF5XX_I2S
select SND_BF5XX_SOC_I2S
- select SND_SOC_ADAU1361
+ select SND_SOC_ADAU1373
select I2C
help
- Say Y if you want to add support for ADAU1361 SoC audio.
+ Say Y if you want to add support for ADAU1373 SoC audio.
config SND_BF5XX_SOC_ADAU1381
tristate "SoC ADAU1381 Audio support"
@@ -68,14 +76,14 @@
help
Say Y if you want to add support for ADAU1381 SoC audio.
-config SND_BF5XX_SOC_ADAU1373
- tristate "SoC ADAU1373 Audio support"
+config SND_BF5XX_SOC_ADAU1761
+ tristate "SoC ADAU1761 Audio support"
depends on SND_BF5XX_I2S
select SND_BF5XX_SOC_I2S
- select SND_SOC_ADAU1373
+ select SND_SOC_ADAU1761
select I2C
help
- Say Y if you want to add support for ADAU1373 SoC audio.
+ Say Y if you want to add support for ADAU1761 SoC audio.
config SND_BF5XX_SOC_ADAV80X
tristate "SoC ADAV801/3 Audio support"
@@ -85,14 +93,6 @@
help
Say Y if you want to add support for ADAV80X SoC audio.
-config SND_BFIN_AD73311_SE
- int "PF pin for AD73311L Chip Select"
- depends on SND_BF5XX_SOC_AD73311
- default 4
- help
- Enter the GPIO used to control AD73311's SE pin. Acceptable
- values are 0 to 7
-
config SND_BF5XX_TDM
tristate "SoC I2S(TDM mode) Audio for the ADI BF5xx chip"
depends on (BLACKFIN && SND_SOC)
Modified: trunk/sound/soc/blackfin/Makefile (9062 => 9063)
--- trunk/sound/soc/blackfin/Makefile 2010-08-07 05:07:45 UTC (rev 9062)
+++ trunk/sound/soc/blackfin/Makefile 2010-08-07 07:05:18 UTC (rev 9063)
@@ -21,11 +21,11 @@
snd-ssm2602-objs := bf5xx-ssm2602.o
snd-ad73311-objs := bf5xx-ad73311.o
snd-ad193x-objs := bf5xx-ad193x.o
+snd-adau1361-objs := bf5xx-adau1361.o
snd-adau1371-objs := bf5xx-adau1371.o
+snd-adau1373-objs := bf5xx-adau1373.o
+snd-adau1381-objs := bf5xx-adau1381.o
snd-adau1761-objs := bf5xx-adau1761.o
-snd-adau1361-objs := bf5xx-adau1361.o
-snd-adau1381-objs := bf5xx-adau1381.o
-snd-adau1373-objs := bf5xx-adau1373.o
snd-adav80x-objs := bf5xx-adav80x.o
obj-$(CONFIG_SND_BF5XX_SOC_AD183X) += snd-ad183x.o
@@ -33,9 +33,9 @@
obj-$(CONFIG_SND_BF5XX_SOC_SSM2602) += snd-ssm2602.o
obj-$(CONFIG_SND_BF5XX_SOC_AD73311) += snd-ad73311.o
obj-$(CONFIG_SND_BF5XX_SOC_AD193X) += snd-ad193x.o
+obj-$(CONFIG_SND_BF5XX_SOC_ADAU1361) += snd-adau1361.o
obj-$(CONFIG_SND_BF5XX_SOC_ADAU1371) += snd-adau1371.o
+obj-$(CONFIG_SND_BF5XX_SOC_ADAU1373) += snd-adau1373.o
+obj-$(CONFIG_SND_BF5XX_SOC_ADAU1381) += snd-adau1381.o
obj-$(CONFIG_SND_BF5XX_SOC_ADAU1761) += snd-adau1761.o
-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/Kconfig (9062 => 9063)
--- trunk/sound/soc/codecs/Kconfig 2010-08-07 05:07:45 UTC (rev 9062)
+++ trunk/sound/soc/codecs/Kconfig 2010-08-07 07:05:18 UTC (rev 9063)
@@ -15,14 +15,14 @@
select SND_SOC_AD183X if SPI_MASTER
select SND_SOC_AD193X if SND_SOC_I2C_AND_SPI
select SND_SOC_AD1980 if SND_SOC_AC97_BUS
- select SND_SOC_ADS117X
select SND_SOC_AD73311 if I2C
+ select SND_SOC_ADAU1361 if I2C
select SND_SOC_ADAU1371 if I2C
+ select SND_SOC_ADAU1373 if I2C
+ select SND_SOC_ADAU1381 if I2C
select SND_SOC_ADAU1761 if I2C
- select SND_SOC_ADAU1361 if I2C
- select SND_SOC_ADAU1381 if I2C
- select SND_SOC_ADAU1373 if I2C
select SND_SOC_ADAV80X if SND_SOC_I2C_AND_SPI
+ select SND_SOC_ADS117X
select SND_SOC_AK4104 if SPI_MASTER
select SND_SOC_AK4535 if I2C
select SND_SOC_AK4642 if I2C
@@ -106,26 +106,28 @@
config SND_SOC_AD73311
tristate
-config SND_SOC_ADS117X
+config SND_SOC_ADAU1361
tristate
config SND_SOC_ADAU1371
tristate
- select SIGMA
+config SND_SOC_ADAU1373
+ tristate
+
+config SND_SOC_ADAU1381
+ tristate
+
config SND_SOC_ADAU1761
tristate
select SIGMA
-config SND_SOC_ADAU1361
+config SND_SOC_ADAV80X
tristate
-config SND_SOC_ADAU1381
+config SND_SOC_ADS117X
tristate
-config SND_SOC_ADAU1373
- tristate
-
config SND_SOC_ADAV80X
tristate
Modified: trunk/sound/soc/codecs/Makefile (9062 => 9063)
--- trunk/sound/soc/codecs/Makefile 2010-08-07 05:07:45 UTC (rev 9062)
+++ trunk/sound/soc/codecs/Makefile 2010-08-07 07:05:18 UTC (rev 9063)
@@ -5,9 +5,9 @@
snd-soc-ad73311-objs := ad73311.o
snd-soc-adau1361-objs := adau1361.o
snd-soc-adau1371-objs := adau1371.o
+snd-soc-adau1373-objs := adau1373.o
snd-soc-adau1381-objs := adau1381.o
snd-soc-adau1761-objs := adau1761.o
-snd-soc-adau1373-objs := adau1373.o
snd-soc-adav80x-objs := adav80x.o
snd-soc-ads117x-objs := ads117x.o
snd-soc-ak4104-objs := ak4104.o
@@ -74,9 +74,9 @@
obj-$(CONFIG_SND_SOC_AD73311) += snd-soc-ad73311.o
obj-$(CONFIG_SND_SOC_ADAU1361) += snd-soc-adau1361.o
obj-$(CONFIG_SND_SOC_ADAU1371) += snd-soc-adau1371.o
+obj-$(CONFIG_SND_SOC_ADAU1373) += snd-soc-adau1373.o
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
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
