aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMisael Lopez Cruz2013-06-17 11:33:34 -0500
committerMisael Lopez Cruz2013-07-22 15:04:22 -0500
commite1c8f0a5e05cf2f133420a977f6f07a8a326bd24 (patch)
tree27218c0f274b9c223026bb8f12f23eb92176742f
parent1141b88ddc3129e6916d02c381861e3299694efc (diff)
downloadkernel-audio-e1c8f0a5e05cf2f133420a977f6f07a8a326bd24.tar.gz
kernel-audio-e1c8f0a5e05cf2f133420a977f6f07a8a326bd24.tar.xz
kernel-audio-e1c8f0a5e05cf2f133420a977f6f07a8a326bd24.zip
ARM: dts: dra7: Add McASP nodes
McASP3 is configured in I2S mode with AXR0 as TX and AXR1 as RX. McASP6 is configured in TDM mode (uses same op-mode property value than I2S) with 8-slots, AXR0 is used for TX and AXR1 for RX. Interrupt property in both nodes is using McASP1's in the meantime since McASP3 and McASP6 don't have default interrupt lines and have to be assigned through IRQ crossbar. Change-Id: I766dcbea9190083c6fe0e01501104226d480a22f Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
-rw-r--r--arch/arm/boot/dts/dra7.dtsi28
1 files changed, 28 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index a1f1ea62febf..c801591aa6ef 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -668,5 +668,33 @@
668 video-source = <1>; 668 video-source = <1>;
669 }; 669 };
670 }; 670 };
671
672 mcasp3: mcasp@48468000 {
673 compatible = "ti,dra7-mcasp-audio";
674 reg = <0x48468000 0x2000>;
675 interrupts = <0 108 0x4>, /* AREVT */
676 <0 109 0x4>; /* TXEVT */
677 ti,hwmods = "mcasp3";
678 op-mode = <0>; /* MCASP_IIS_MODE */
679 tdm-slots = <2>;
680 num-serializer = <4>;
681 serial-dir = <1 2 0 0>; /* 0:INACTIVE, 1:TX, 2:RX */
682 ti,tx-inactive-mode = <2>; /* 0: Hi-Z, 2: Low, 3: High */
683 ti,rx-inactive-mode = <2>; /* 0: Hi-Z, 2: Low, 3: High */
684 };
685
686 mcasp6: mcasp@48474000 {
687 compatible = "ti,dra7-mcasp-audio";
688 reg = <0x48474000 0x2000>;
689 interrupts = <0 108 0x4>, /* AREVT */
690 <0 109 0x4>; /* TXEVT */
691 ti,hwmods = "mcasp6";
692 op-mode = <0>; /* MCASP_IIS_MODE */
693 tdm-slots = <8>;
694 num-serializer = <4>;
695 serial-dir = <1 2 0 0>; /* 0:INACTIVE, 1:TX, 2:RX */
696 ti,tx-inactive-mode = <2>; /* 0: Hi-Z, 2: Low, 3: High */
697 ti,rx-inactive-mode = <2>; /* 0: Hi-Z, 2: Low, 3: High */
698 };
671 }; 699 };
672}; 700};