]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
OMAP4: 4430sdp: Register platform device for OMAP4 audio
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Wed, 7 Dec 2011 13:59:35 +0000 (15:59 +0200)
committerPeter Ujfalusi <peter.ujfalusi@ti.com>
Thu, 26 Jan 2012 13:39:11 +0000 (15:39 +0200)
To avoid breakage in audio support with the coming change
in ASoC machine driver (conversion to platfrom device).

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
CC: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
arch/arm/mach-omap2/board-4430sdp.c

index 39fba9df17fba3209396cba2d8be2d59553c8ab5..7eaeb0806e283f460cbb560c786b070601d96503 100644 (file)
@@ -41,6 +41,7 @@
 #include <video/omap-panel-nokia-dsi.h>
 #include <video/omap-panel-picodlp.h>
 #include <linux/wl12xx.h>
+#include <linux/platform_data/omap-abe-twl6040.h>
 
 #include "mux.h"
 #include "hsmmc.h"
@@ -377,12 +378,40 @@ static struct platform_device sdp4430_dmic_codec = {
        .id     = -1,
 };
 
+static struct omap_abe_twl6040_data sdp4430_abe_audio_data = {
+       .card_name = "SDP4430",
+       .has_hs         = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT,
+       .has_hf         = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT,
+       .has_ep         = 1,
+       .has_aux        = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT,
+       .has_vibra      = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT,
+
+       .has_dmic       = 1,
+       .has_hsmic      = 1,
+       .has_mainmic    = 1,
+       .has_submic     = 1,
+       .has_afm        = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT,
+
+       .jack_detection = 1,
+       /* MCLK input is 38.4MHz */
+       .mclk_freq      = 38400000,
+};
+
+static struct platform_device sdp4430_abe_audio = {
+       .name           = "omap-abe-twl6040",
+       .id             = -1,
+       .dev = {
+               .platform_data = &sdp4430_abe_audio_data,
+       },
+};
+
 static struct platform_device *sdp4430_devices[] __initdata = {
        &sdp4430_gpio_keys_device,
        &sdp4430_leds_gpio,
        &sdp4430_leds_pwm,
        &sdp4430_vbat,
        &sdp4430_dmic_codec,
+       &sdp4430_abe_audio,
 };
 
 static struct omap_musb_board_data musb_board_data = {