summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Ford <adam.ford@logicpd.com>2015-10-23 07:20:23 -0500
committerTony Lindgren <tony@atomide.com>2015-11-30 11:17:08 -0800
commitf81902e44a2738a3228c96f2307f449cfc0acc89 (patch)
treeef26e864c3a441f196434620ba1d170effee5ac9
parent201c7e3386059204c0048384900c82276e0a37fe (diff)
downloadtalos-op-linux-f81902e44a2738a3228c96f2307f449cfc0acc89.tar.gz
talos-op-linux-f81902e44a2738a3228c96f2307f449cfc0acc89.zip
ARM: dts: Add audio support for LogicPD Torpedo DM3730 devkit
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>
-rw-r--r--arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts10
-rw-r--r--arch/arm/boot/dts/logicpd-torpedo-som.dtsi13
2 files changed, 23 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
index 5b0430041ec6..afc13e58cffb 100644
--- a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
+++ b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
@@ -48,6 +48,12 @@
};
};
+ sound {
+ compatible = "ti,omap-twl4030";
+ ti,model = "omap3logic";
+ ti,mcbsp = <&mcbsp2>;
+ };
+
leds {
compatible = "gpio-leds";
pinctrl-names = "default";
@@ -67,6 +73,10 @@
};
};
+&mcbsp2 {
+ status = "okay";
+};
+
&charger {
ti,bb-uvolt = <3200000>;
ti,bb-uamp = <150>;
diff --git a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
index 36387b11451d..9777ff44eb67 100644
--- a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
+++ b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
@@ -96,6 +96,11 @@
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(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 {
OpenPOWER on IntegriCloud