diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2011-12-07 08:59:35 -0500 |
---|---|---|
committer | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-01-26 08:39:11 -0500 |
commit | a433ffabab2996637ac941b75a7b22ecb41ef1a4 (patch) | |
tree | 81a991e856831ba81f282851edd0c911d2959b10 /arch/arm/mach-omap2/board-4430sdp.c | |
parent | d71e600836aa5597837970cb754057b2b884035c (diff) |
OMAP4: 4430sdp: Register platform device for OMAP4 audio
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>
Diffstat (limited to 'arch/arm/mach-omap2/board-4430sdp.c')
-rw-r--r-- | arch/arm/mach-omap2/board-4430sdp.c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 39fba9df17fb..7eaeb0806e28 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c | |||
@@ -41,6 +41,7 @@ | |||
41 | #include <video/omap-panel-nokia-dsi.h> | 41 | #include <video/omap-panel-nokia-dsi.h> |
42 | #include <video/omap-panel-picodlp.h> | 42 | #include <video/omap-panel-picodlp.h> |
43 | #include <linux/wl12xx.h> | 43 | #include <linux/wl12xx.h> |
44 | #include <linux/platform_data/omap-abe-twl6040.h> | ||
44 | 45 | ||
45 | #include "mux.h" | 46 | #include "mux.h" |
46 | #include "hsmmc.h" | 47 | #include "hsmmc.h" |
@@ -377,12 +378,40 @@ static struct platform_device sdp4430_dmic_codec = { | |||
377 | .id = -1, | 378 | .id = -1, |
378 | }; | 379 | }; |
379 | 380 | ||
381 | static struct omap_abe_twl6040_data sdp4430_abe_audio_data = { | ||
382 | .card_name = "SDP4430", | ||
383 | .has_hs = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT, | ||
384 | .has_hf = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT, | ||
385 | .has_ep = 1, | ||
386 | .has_aux = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT, | ||
387 | .has_vibra = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT, | ||
388 | |||
389 | .has_dmic = 1, | ||
390 | .has_hsmic = 1, | ||
391 | .has_mainmic = 1, | ||
392 | .has_submic = 1, | ||
393 | .has_afm = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT, | ||
394 | |||
395 | .jack_detection = 1, | ||
396 | /* MCLK input is 38.4MHz */ | ||
397 | .mclk_freq = 38400000, | ||
398 | }; | ||
399 | |||
400 | static struct platform_device sdp4430_abe_audio = { | ||
401 | .name = "omap-abe-twl6040", | ||
402 | .id = -1, | ||
403 | .dev = { | ||
404 | .platform_data = &sdp4430_abe_audio_data, | ||
405 | }, | ||
406 | }; | ||
407 | |||
380 | static struct platform_device *sdp4430_devices[] __initdata = { | 408 | static struct platform_device *sdp4430_devices[] __initdata = { |
381 | &sdp4430_gpio_keys_device, | 409 | &sdp4430_gpio_keys_device, |
382 | &sdp4430_leds_gpio, | 410 | &sdp4430_leds_gpio, |
383 | &sdp4430_leds_pwm, | 411 | &sdp4430_leds_pwm, |
384 | &sdp4430_vbat, | 412 | &sdp4430_vbat, |
385 | &sdp4430_dmic_codec, | 413 | &sdp4430_dmic_codec, |
414 | &sdp4430_abe_audio, | ||
386 | }; | 415 | }; |
387 | 416 | ||
388 | static struct omap_musb_board_data musb_board_data = { | 417 | static struct omap_musb_board_data musb_board_data = { |