aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-02-12 12:20:58 -0500
committerJason Cooper <jason@lakedaemon.net>2014-02-16 21:42:38 -0500
commit74839835fbe79726ce004deb9318cf22894959bc (patch)
tree5caf73a13001e3acd8a8a13b780bdbe6717347be
parent5c0169d1c503aab2d62ee6f6e342a78e2ea9e3ed (diff)
ARM: mvebu: add audio I2S controller to Armada 370 Device Tree
The Armada 370 SoC has an I2S audio controller. This commit adds the description of this controller to the Device Tree describing this SoC, as well as two possible muxing configurations for the I2S bus pins. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r--arch/arm/boot/dts/armada-370.dtsi23
1 files changed, 23 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index 0d8530c98cf5..e3f4c187ef48 100644
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -132,6 +132,20 @@
132 "mpp51", "mpp52", "mpp53"; 132 "mpp51", "mpp52", "mpp53";
133 marvell,function = "sd0"; 133 marvell,function = "sd0";
134 }; 134 };
135
136 i2s_pins1: i2s-pins1 {
137 marvell,pins = "mpp5", "mpp6", "mpp7",
138 "mpp8", "mpp9", "mpp10",
139 "mpp12", "mpp13";
140 marvell,function = "audio";
141 };
142
143 i2s_pins2: i2s-pins2 {
144 marvell,pins = "mpp49", "mpp47", "mpp50",
145 "mpp59", "mpp57", "mpp61",
146 "mpp62", "mpp60", "mpp58";
147 marvell,function = "audio";
148 };
135 }; 149 };
136 150
137 gpio0: gpio@18100 { 151 gpio0: gpio@18100 {
@@ -196,6 +210,15 @@
196 clocks = <&coreclk 2>; 210 clocks = <&coreclk 2>;
197 }; 211 };
198 212
213 audio_controller: audio-controller@30000 {
214 compatible = "marvell,armada370-audio";
215 reg = <0x30000 0x4000>;
216 interrupts = <93>;
217 clocks = <&gateclk 0>;
218 clock-names = "internal";
219 status = "disabled";
220 };
221
199 usb@50000 { 222 usb@50000 {
200 clocks = <&coreclk 0>; 223 clocks = <&coreclk 0>;
201 }; 224 };