Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 206570
b: refs/heads/master
c: 4b94dba
h: refs/heads/master
v: v3
  • Loading branch information
Grazvydas Ignotas authored and Liam Girdwood committed Jun 21, 2010
1 parent db2e2bd commit 731d53e
Show file tree
Hide file tree
Showing 20 changed files with 41 additions and 1,759 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9c1be7e8cb1e33d4d7d4bed40466ee358fdf5a34
refs/heads/master: 4b94dba029887effd8675164e782cb12889668b1
12 changes: 0 additions & 12 deletions trunk/include/sound/uda134x.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,6 @@ struct uda134x_platform_data {
struct l3_pins l3;
void (*power) (int);
int model;
/*
ALSA SOC usually puts the device in standby mode when it's not used
for sometime. If you unset is_powered_on_standby the driver will
turn off the ADC/DAC when this callback is invoked and turn it back
on when needed. Unfortunately this will result in a very light bump
(it can be audible only with good earphones). If this bothers you
set is_powered_on_standby, you will have slightly higher power
consumption. Please note that sending the L3 command for ADC is
enough to make the bump, so it doesn't make difference if you
completely take off power from the codec.
*/
int is_powered_on_standby;
#define UDA134X_UDA1340 1
#define UDA134X_UDA1341 2
#define UDA134X_UDA1344 3
Expand Down
1 change: 0 additions & 1 deletion trunk/sound/soc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ source "sound/soc/s3c24xx/Kconfig"
source "sound/soc/s6000/Kconfig"
source "sound/soc/sh/Kconfig"
source "sound/soc/txx9/Kconfig"
source "sound/soc/jz4740/Kconfig"

# Supported codecs
source "sound/soc/codecs/Kconfig"
Expand Down
1 change: 0 additions & 1 deletion trunk/sound/soc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,3 @@ obj-$(CONFIG_SND_SOC) += s3c24xx/
obj-$(CONFIG_SND_SOC) += s6000/
obj-$(CONFIG_SND_SOC) += sh/
obj-$(CONFIG_SND_SOC) += txx9/
obj-$(CONFIG_SND_SOC) += jz4740/
12 changes: 4 additions & 8 deletions trunk/sound/soc/codecs/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,8 @@ config SND_SOC_ALL_CODECS
select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC
select SND_SOC_CS42L51 if I2C
select SND_SOC_CS4270 if I2C
select SND_SOC_DA7210 if I2C
select SND_SOC_JZ4740 if SOC_JZ4740
select SND_SOC_MAX9877 if I2C
select SND_SOC_DA7210 if I2C
select SND_SOC_PCM3008
select SND_SOC_SPDIF
select SND_SOC_SSM2602 if I2C
Expand Down Expand Up @@ -129,6 +128,9 @@ config SND_SOC_CS42L51
config SND_SOC_CS4270
tristate

config SND_SOC_DA7210
tristate

# Cirrus Logic CS4270 Codec VD = 3.3V Errata
# Select if you are affected by the errata where the part will not function
# if MCLK divide-by-1.5 is selected and VD is set to 3.3V. The driver will
Expand All @@ -140,15 +142,9 @@ config SND_SOC_CS4270_VD33_ERRATA
config SND_SOC_CX20442
tristate

config SND_SOC_JZ4740_CODEC
tristate

config SND_SOC_L3
tristate

config SND_SOC_DA7210
tristate

config SND_SOC_PCM3008
tristate

Expand Down
2 changes: 0 additions & 2 deletions trunk/sound/soc/codecs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ snd-soc-wm9705-objs := wm9705.o
snd-soc-wm9712-objs := wm9712.o
snd-soc-wm9713-objs := wm9713.o
snd-soc-wm-hubs-objs := wm_hubs.o
snd-soc-jz4740-codec-objs := jz4740.o

# Amp
snd-soc-max9877-objs := max9877.o
Expand All @@ -81,7 +80,6 @@ obj-$(CONFIG_SND_SOC_CS4270) += snd-soc-cs4270.o
obj-$(CONFIG_SND_SOC_CX20442) += snd-soc-cx20442.o
obj-$(CONFIG_SND_SOC_DA7210) += snd-soc-da7210.o
obj-$(CONFIG_SND_SOC_L3) += snd-soc-l3.o
obj-$(CONFIG_SND_SOC_JZ4740_CODEC) += snd-soc-jz4740-codec.o
obj-$(CONFIG_SND_SOC_PCM3008) += snd-soc-pcm3008.o
obj-$(CONFIG_SND_SOC_SPDIF) += snd-soc-spdif.o
obj-$(CONFIG_SND_SOC_SSM2602) += snd-soc-ssm2602.o
Expand Down
Loading

0 comments on commit 731d53e

Please sign in to comment.