Commit ac51c90f authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown

ARM: OMAP3: Switch to use the unified audio driver (omap-twl4030) for selected boards

These boards have similar audio setup and they can all use the same driver
for audio support if it is enabled in the kernel config.
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 552d9dc3
...@@ -731,6 +731,7 @@ static void __init cm_t3x_common_init(void) ...@@ -731,6 +731,7 @@ static void __init cm_t3x_common_init(void)
cm_t35_init_ethernet(); cm_t35_init_ethernet();
cm_t35_init_led(); cm_t35_init_led();
cm_t35_init_display(); cm_t35_init_display();
omap_twl4030_audio_init("cm-t3x");
usb_musb_init(NULL); usb_musb_init(NULL);
cm_t35_init_usbh(); cm_t35_init_usbh();
......
...@@ -630,6 +630,7 @@ static void __init devkit8000_init(void) ...@@ -630,6 +630,7 @@ static void __init devkit8000_init(void)
usbhs_init(&usbhs_bdata); usbhs_init(&usbhs_bdata);
omap_nand_flash_init(NAND_BUSWIDTH_16, devkit8000_nand_partitions, omap_nand_flash_init(NAND_BUSWIDTH_16, devkit8000_nand_partitions,
ARRAY_SIZE(devkit8000_nand_partitions)); ARRAY_SIZE(devkit8000_nand_partitions));
omap_twl4030_audio_init("omap3beagle");
/* Ensure SDRC pins are mux'd for self-refresh */ /* Ensure SDRC pins are mux'd for self-refresh */
omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT); omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
......
...@@ -626,6 +626,7 @@ static void __init igep_init(void) ...@@ -626,6 +626,7 @@ static void __init igep_init(void)
igep_flash_init(); igep_flash_init();
igep_leds_init(); igep_leds_init();
omap_twl4030_audio_init("igep2");
/* /*
* WLAN-BT combo module from MuRata which has a Marvell WLAN * WLAN-BT combo module from MuRata which has a Marvell WLAN
......
...@@ -519,6 +519,7 @@ static void __init omap3_beagle_init(void) ...@@ -519,6 +519,7 @@ static void __init omap3_beagle_init(void)
usbhs_init(&usbhs_bdata); usbhs_init(&usbhs_bdata);
omap_nand_flash_init(NAND_BUSWIDTH_16, omap3beagle_nand_partitions, omap_nand_flash_init(NAND_BUSWIDTH_16, omap3beagle_nand_partitions,
ARRAY_SIZE(omap3beagle_nand_partitions)); ARRAY_SIZE(omap3beagle_nand_partitions));
omap_twl4030_audio_init("omap3beagle");
/* Ensure msecure is mux'd to be able to set the RTC. */ /* Ensure msecure is mux'd to be able to set the RTC. */
omap_mux_init_signal("sys_drm_msecure", OMAP_PIN_OFF_OUTPUT_HIGH); omap_mux_init_signal("sys_drm_msecure", OMAP_PIN_OFF_OUTPUT_HIGH);
......
...@@ -736,6 +736,7 @@ static void __init omap3_evm_init(void) ...@@ -736,6 +736,7 @@ static void __init omap3_evm_init(void)
omap3evm_init_smsc911x(); omap3evm_init_smsc911x();
omap3_evm_display_init(); omap3_evm_display_init();
omap3_evm_wl12xx_init(); omap3_evm_wl12xx_init();
omap_twl4030_audio_init("omap3evm");
} }
MACHINE_START(OMAP3EVM, "OMAP3 EVM") MACHINE_START(OMAP3EVM, "OMAP3 EVM")
......
...@@ -509,6 +509,7 @@ static void __init overo_init(void) ...@@ -509,6 +509,7 @@ static void __init overo_init(void)
overo_display_init(); overo_display_init();
overo_init_led(); overo_init_led();
overo_init_keys(); overo_init_keys();
omap_twl4030_audio_init("overo");
/* Ensure SDRC pins are mux'd for self-refresh */ /* Ensure SDRC pins are mux'd for self-refresh */
omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT); omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment