* Peter Ujfalusi <[email protected]> [111222 11:03]: > To avoid breakage in audio support with the coming change > in ASoC machine driver (conversion to platfrom device). > > Signed-off-by: Peter Ujfalusi <[email protected]> > CC: Santosh Shilimkar <[email protected]>
Acked-by: Tony Lindgren <[email protected]> > --- > arch/arm/mach-omap2/board-4430sdp.c | 27 +++++++++++++++++++++++++++ > 1 files changed, 27 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-omap2/board-4430sdp.c > b/arch/arm/mach-omap2/board-4430sdp.c > index 21b62bd..394cbab 100644 > --- a/arch/arm/mach-omap2/board-4430sdp.c > +++ b/arch/arm/mach-omap2/board-4430sdp.c > @@ -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,38 @@ 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, > +}; > + > +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 = { > -- > 1.7.8.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
