summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-zoom2.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-12-04 16:22:41 +0100
committerTakashi Iwai <tiwai@suse.de>2009-12-04 16:22:41 +0100
commitbaf9226667734579e344f612ed39f727079cad51 (patch)
tree9744efb5f1838ea73b695a0ab862547fdcf92ecf /arch/arm/mach-omap2/board-zoom2.c
parent57648cd52b1848c6885bdbd948d113d52f3ddd43 (diff)
parent43f0de8d0298e624e6c3bf2185b6003a59b331bd (diff)
downloadlinux-baf9226667734579e344f612ed39f727079cad51.tar.gz
linux-baf9226667734579e344f612ed39f727079cad51.tar.bz2
linux-baf9226667734579e344f612ed39f727079cad51.zip
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'arch/arm/mach-omap2/board-zoom2.c')
-rw-r--r--arch/arm/mach-omap2/board-zoom2.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-zoom2.c b/arch/arm/mach-omap2/board-zoom2.c
index 51e0b3ba5f3a..51df584728f6 100644
--- a/arch/arm/mach-omap2/board-zoom2.c
+++ b/arch/arm/mach-omap2/board-zoom2.c
@@ -230,6 +230,15 @@ static struct twl4030_madc_platform_data zoom2_madc_data = {
.irq_line = 1,
};
+static struct twl4030_codec_audio_data zoom2_audio_data = {
+ .audio_mclk = 26000000,
+};
+
+static struct twl4030_codec_data zoom2_codec_data = {
+ .audio_mclk = 26000000,
+ .audio = &zoom2_audio_data,
+};
+
static struct twl4030_platform_data zoom2_twldata = {
.irq_base = TWL4030_IRQ_BASE,
.irq_end = TWL4030_IRQ_END,
@@ -240,6 +249,7 @@ static struct twl4030_platform_data zoom2_twldata = {
.usb = &zoom2_usb_data,
.gpio = &zoom2_gpio_data,
.keypad = &zoom2_kp_twl4030_data,
+ .codec = &zoom2_codec_data,
.vmmc1 = &zoom2_vmmc1,
.vmmc2 = &zoom2_vmmc2,
.vsim = &zoom2_vsim,