aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2008-09-06 13:11:51 -0400
committerJaroslav Kysela <perex@perex.cz>2008-09-09 03:11:58 -0400
commit3e860846d7f44993ded9b4fbf36e7b051b86df08 (patch)
tree79777bc97f3558eacbeb69076193432c56cd58d4 /sound/soc
parentd540de4c2d53753f29a042525bc7267e2e4533b3 (diff)
ALSA: ASoC: Sort Kconfig and Makefile entries for codecs
Hopefully this will make merges a little bit easier. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/Kconfig64
-rw-r--r--sound/soc/codecs/Makefile16
2 files changed, 40 insertions, 40 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 8b4bb5c5af26..27f2dfa7ca1a 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -4,7 +4,10 @@ config SND_SOC_ALL_CODECS
4 select SPI 4 select SPI
5 select SPI_MASTER 5 select SPI_MASTER
6 select SND_SOC_AK4535 6 select SND_SOC_AK4535
7 select SND_SOC_CS4270
7 select SND_SOC_SSM2602 8 select SND_SOC_SSM2602
9 select SND_SOC_TLV320AIC26
10 select SND_SOC_TLV320AIC3X
8 select SND_SOC_UDA1380 11 select SND_SOC_UDA1380
9 select SND_SOC_WM8510 12 select SND_SOC_WM8510
10 select SND_SOC_WM8580 13 select SND_SOC_WM8580
@@ -14,9 +17,6 @@ config SND_SOC_ALL_CODECS
14 select SND_SOC_WM8900 17 select SND_SOC_WM8900
15 select SND_SOC_WM8903 18 select SND_SOC_WM8903
16 select SND_SOC_WM8990 19 select SND_SOC_WM8990
17 select SND_SOC_CS4270
18 select SND_SOC_TLV320AIC26
19 select SND_SOC_TLV320AIC3X
20 help 20 help
21 Normally ASoC codec drivers are only built if a machine driver which 21 Normally ASoC codec drivers are only built if a machine driver which
22 uses them is also built since they are only usable with a machine 22 uses them is also built since they are only usable with a machine
@@ -36,6 +36,35 @@ config SND_SOC_AD1980
36config SND_SOC_AK4535 36config SND_SOC_AK4535
37 tristate 37 tristate
38 38
39# Cirrus Logic CS4270 Codec
40config SND_SOC_CS4270
41 tristate
42
43# Cirrus Logic CS4270 Codec Hardware Mute Support
44# Select if you have external muting circuitry attached to your CS4270.
45config SND_SOC_CS4270_HWMUTE
46 bool
47 depends on SND_SOC_CS4270
48
49# Cirrus Logic CS4270 Codec VD = 3.3V Errata
50# Select if you are affected by the errata where the part will not function
51# if MCLK divide-by-1.5 is selected and VD is set to 3.3V. The driver will
52# not select any sample rates that require MCLK to be divided by 1.5.
53config SND_SOC_CS4270_VD33_ERRATA
54 bool
55 depends on SND_SOC_CS4270
56
57config SND_SOC_SSM2602
58 tristate
59
60config SND_SOC_TLV320AIC26
61 tristate "TI TLV320AIC26 Codec support"
62 depends on SND_SOC && SPI
63
64config SND_SOC_TLV320AIC3X
65 tristate
66 depends on I2C
67
39config SND_SOC_UDA1380 68config SND_SOC_UDA1380
40 tristate 69 tristate
41 70
@@ -68,32 +97,3 @@ config SND_SOC_WM9712
68 97
69config SND_SOC_WM9713 98config SND_SOC_WM9713
70 tristate 99 tristate
71
72# Cirrus Logic CS4270 Codec
73config SND_SOC_CS4270
74 tristate
75
76# Cirrus Logic CS4270 Codec Hardware Mute Support
77# Select if you have external muting circuitry attached to your CS4270.
78config SND_SOC_CS4270_HWMUTE
79 bool
80 depends on SND_SOC_CS4270
81
82# Cirrus Logic CS4270 Codec VD = 3.3V Errata
83# Select if you are affected by the errata where the part will not function
84# if MCLK divide-by-1.5 is selected and VD is set to 3.3V. The driver will
85# not select any sample rates that require MCLK to be divided by 1.5.
86config SND_SOC_CS4270_VD33_ERRATA
87 bool
88 depends on SND_SOC_CS4270
89
90config SND_SOC_TLV320AIC26
91 tristate "TI TLV320AIC26 Codec support"
92 depends on SND_SOC && SPI
93
94config SND_SOC_TLV320AIC3X
95 tristate
96 depends on I2C
97
98config SND_SOC_SSM2602
99 tristate
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 0cd55ee65151..c2b8783c07d1 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -1,6 +1,10 @@
1snd-soc-ac97-objs := ac97.o 1snd-soc-ac97-objs := ac97.o
2snd-soc-ad1980-objs := ad1980.o 2snd-soc-ad1980-objs := ad1980.o
3snd-soc-ak4535-objs := ak4535.o 3snd-soc-ak4535-objs := ak4535.o
4snd-soc-cs4270-objs := cs4270.o
5snd-soc-ssm2602-objs := ssm2602.o
6snd-soc-tlv320aic26-objs := tlv320aic26.o
7snd-soc-tlv320aic3x-objs := tlv320aic3x.o
4snd-soc-uda1380-objs := uda1380.o 8snd-soc-uda1380-objs := uda1380.o
5snd-soc-wm8510-objs := wm8510.o 9snd-soc-wm8510-objs := wm8510.o
6snd-soc-wm8580-objs := wm8580.o 10snd-soc-wm8580-objs := wm8580.o
@@ -12,14 +16,14 @@ snd-soc-wm8903-objs := wm8903.o
12snd-soc-wm8990-objs := wm8990.o 16snd-soc-wm8990-objs := wm8990.o
13snd-soc-wm9712-objs := wm9712.o 17snd-soc-wm9712-objs := wm9712.o
14snd-soc-wm9713-objs := wm9713.o 18snd-soc-wm9713-objs := wm9713.o
15snd-soc-cs4270-objs := cs4270.o
16snd-soc-tlv320aic26-objs := tlv320aic26.o
17snd-soc-tlv320aic3x-objs := tlv320aic3x.o
18snd-soc-ssm2602-objs := ssm2602.o
19 19
20obj-$(CONFIG_SND_SOC_AC97_CODEC) += snd-soc-ac97.o 20obj-$(CONFIG_SND_SOC_AC97_CODEC) += snd-soc-ac97.o
21obj-$(CONFIG_SND_SOC_AD1980) += snd-soc-ad1980.o 21obj-$(CONFIG_SND_SOC_AD1980) += snd-soc-ad1980.o
22obj-$(CONFIG_SND_SOC_AK4535) += snd-soc-ak4535.o 22obj-$(CONFIG_SND_SOC_AK4535) += snd-soc-ak4535.o
23obj-$(CONFIG_SND_SOC_CS4270) += snd-soc-cs4270.o
24obj-$(CONFIG_SND_SOC_SSM2602) += snd-soc-ssm2602.o
25obj-$(CONFIG_SND_SOC_TLV320AIC26) += snd-soc-tlv320aic26.o
26obj-$(CONFIG_SND_SOC_TLV320AIC3X) += snd-soc-tlv320aic3x.o
23obj-$(CONFIG_SND_SOC_UDA1380) += snd-soc-uda1380.o 27obj-$(CONFIG_SND_SOC_UDA1380) += snd-soc-uda1380.o
24obj-$(CONFIG_SND_SOC_WM8510) += snd-soc-wm8510.o 28obj-$(CONFIG_SND_SOC_WM8510) += snd-soc-wm8510.o
25obj-$(CONFIG_SND_SOC_WM8580) += snd-soc-wm8580.o 29obj-$(CONFIG_SND_SOC_WM8580) += snd-soc-wm8580.o
@@ -31,7 +35,3 @@ obj-$(CONFIG_SND_SOC_WM8903) += snd-soc-wm8903.o
31obj-$(CONFIG_SND_SOC_WM8990) += snd-soc-wm8990.o 35obj-$(CONFIG_SND_SOC_WM8990) += snd-soc-wm8990.o
32obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o 36obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o
33obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o 37obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o
34obj-$(CONFIG_SND_SOC_CS4270) += snd-soc-cs4270.o
35obj-$(CONFIG_SND_SOC_TLV320AIC26) += snd-soc-tlv320aic26.o
36obj-$(CONFIG_SND_SOC_TLV320AIC3X) += snd-soc-tlv320aic3x.o
37obj-$(CONFIG_SND_SOC_SSM2602) += snd-soc-ssm2602.o