Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40234bf7 authored by Peter Ujfalusi's avatar Peter Ujfalusi
Browse files

ARM: OMAP2+: twl-common: Allow boards to customize the twl4030 audio setup 



Boards with special audio routing can pass a custom omap_tw4030_pdata to the
audio machine driver.

At the same time update the board files using the same audio driver.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
parent 02553f5a

arch/arm/mach-omap2/board-cm-t35.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -722,7 +722,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");

	omap_twl4030_audio_init("cm-t3x", NULL);





	usb_musb_init(NULL);

	usb_musb_init(NULL);

	cm_t35_init_usbh();

	cm_t35_init_usbh();

arch/arm/mach-omap2/board-devkit8000.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -627,7 +627,7 @@ static void __init devkit8000_init(void) 
	board_nand_init(devkit8000_nand_partitions,

	board_nand_init(devkit8000_nand_partitions,

			ARRAY_SIZE(devkit8000_nand_partitions), NAND_CS,

			ARRAY_SIZE(devkit8000_nand_partitions), NAND_CS,

			NAND_BUSWIDTH_16, NULL);

			NAND_BUSWIDTH_16, NULL);

	omap_twl4030_audio_init("omap3beagle");

	omap_twl4030_audio_init("omap3beagle", NULL);





	/* 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);

arch/arm/mach-omap2/board-igep0020.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -629,7 +629,7 @@ static void __init igep_init(void) 




	igep_flash_init();

	igep_flash_init();

	igep_leds_init();

	igep_leds_init();

	omap_twl4030_audio_init("igep2");

	omap_twl4030_audio_init("igep2", NULL);





	/*

	/*

	 * WLAN-BT combo module from MuRata which has a Marvell WLAN

	 * WLAN-BT combo module from MuRata which has a Marvell WLAN

arch/arm/mach-omap2/board-omap3beagle.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -524,7 +524,7 @@ static void __init omap3_beagle_init(void) 
	board_nand_init(omap3beagle_nand_partitions,

	board_nand_init(omap3beagle_nand_partitions,

			ARRAY_SIZE(omap3beagle_nand_partitions), NAND_CS,

			ARRAY_SIZE(omap3beagle_nand_partitions), NAND_CS,

			NAND_BUSWIDTH_16, NULL);

			NAND_BUSWIDTH_16, NULL);

	omap_twl4030_audio_init("omap3beagle");

	omap_twl4030_audio_init("omap3beagle", NULL);





	/* 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);

arch/arm/mach-omap2/board-omap3evm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -744,7 +744,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");

	omap_twl4030_audio_init("omap3evm", NULL);

}

}





MACHINE_START(OMAP3EVM, "OMAP3 EVM")

MACHINE_START(OMAP3EVM, "OMAP3 EVM")