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

Commit 1837ce35 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/omap' into for-3.7

parents 3876566a 152c6e56

Documentation/devicetree/bindings/sound/omap-twl4030.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
* Texas Instruments SoC with twl4030 based audio setups



Required properties:

- compatible: "ti,omap-twl4030"

- ti,model: Name of the sound card (for example "omap3beagle")

- ti,mcbsp: phandle for the McBSP node

- ti,codec: phandle for the twl4030 audio node



Example:



sound {

	compatible = "ti,omap-twl4030";

	ti,model = "omap3beagle";



	ti,mcbsp = <&mcbsp2>;

	ti,codec = <&twl_audio>;

};

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

+1 −0
Original line number Diff line number Diff line
@@ -731,6 +731,7 @@ static void __init cm_t3x_common_init(void) 
	cm_t35_init_ethernet();

	cm_t35_init_led();

	cm_t35_init_display();

	omap_twl4030_audio_init("cm-t3x");



	usb_musb_init(NULL);

	cm_t35_init_usbh();

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

+1 −0
Original line number Diff line number Diff line
@@ -630,6 +630,7 @@ static void __init devkit8000_init(void) 
	usbhs_init(&usbhs_bdata);

	omap_nand_flash_init(NAND_BUSWIDTH_16, devkit8000_nand_partitions,

			     ARRAY_SIZE(devkit8000_nand_partitions));

	omap_twl4030_audio_init("omap3beagle");



	/* Ensure SDRC pins are mux'd for self-refresh */

	omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);

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

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


	igep_flash_init();

	igep_leds_init();

	omap_twl4030_audio_init("igep2");



	/*

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

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

+1 −0
Original line number Diff line number Diff line
@@ -519,6 +519,7 @@ static void __init omap3_beagle_init(void) 
	usbhs_init(&usbhs_bdata);

	omap_nand_flash_init(NAND_BUSWIDTH_16, 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. */

	omap_mux_init_signal("sys_drm_msecure", OMAP_PIN_OFF_OUTPUT_HIGH);