]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ARM: dts: Add audio support for LogicPD Torpedo DM3730 devkit
authorAdam Ford <adam.ford@logicpd.com>
Fri, 23 Oct 2015 12:20:23 +0000 (07:20 -0500)
committerTony Lindgren <tony@atomide.com>
Mon, 30 Nov 2015 19:17:08 +0000 (11:17 -0800)
Use the TWL4030 Codec with mcbsp2 on Torpedo.

Signed-off-by: Adam Ford <adam.ford@logicpd.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
arch/arm/boot/dts/logicpd-torpedo-som.dtsi

index 5b0430041ec6d1980cb47ba253ce410bcebd05d0..afc13e58cffb1e1ae7bd558e2f63d2e7fe08f932 100644 (file)
@@ -48,6 +48,12 @@ gpio2 {
                };
        };
 
+       sound {
+               compatible = "ti,omap-twl4030";
+               ti,model = "omap3logic";
+               ti,mcbsp = <&mcbsp2>;
+       };
+
        leds {
                compatible = "gpio-leds";
                pinctrl-names = "default";
@@ -67,6 +73,10 @@ led2 {
        };
 };
 
+&mcbsp2 {
+       status = "okay";
+};
+
 &charger {
        ti,bb-uvolt = <3200000>;
        ti,bb-uamp = <150>;
index 36387b11451d4b342873cdadc888723e6bbd208c..9777ff44eb6735902d303b7c4f4a072322dbf209 100644 (file)
@@ -96,6 +96,11 @@ twl: twl@48 {
                reg = <0x48>;
                interrupts = <7>; /* SYS_NIRQ cascaded to intc */
                interrupt-parent = <&intc>;
+               twl_audio: audio {
+                       compatible = "ti,twl4030-audio";
+                       codec {
+                       };
+               };
        };
 };
 
@@ -136,6 +141,14 @@ OMAP3_CORE1_IOPAD(0x2184, PIN_INPUT_PULLUP | MUX_MODE4)    /* mcbsp4_clkx.gpio_152
                        OMAP3_CORE1_IOPAD(0x218e, PIN_OUTPUT | MUX_MODE4)       /* mcbsp1_fsr.gpio_157 */
                >;
        };
+       mcbsp2_pins: pinmux_mcbsp2_pins {
+               pinctrl-single,pins = <
+                       OMAP3_CORE1_IOPAD(0x213c, PIN_INPUT | MUX_MODE0)        /* mcbsp2_fsx */
+                       OMAP3_CORE1_IOPAD(0x213e, PIN_INPUT | MUX_MODE0)        /* mcbsp2_clkx */
+                       OMAP3_CORE1_IOPAD(0x2140, PIN_INPUT | MUX_MODE0)        /* mcbsp2_dr */
+                       OMAP3_CORE1_IOPAD(0x2142, PIN_OUTPUT | MUX_MODE0)       /* mcbsp2_dx */
+               >;
+       };
 };
 
 &omap3_pmx_core2 {