aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiquel Raynal <miquel.raynal@free-electrons.com>2017-10-13 05:01:58 -0400
committerGregory CLEMENT <gregory.clement@free-electrons.com>2017-10-30 10:56:22 -0400
commit7c48dc201bf9aa8636716bccaa78f37a165e725b (patch)
tree62ca7d12b73d245ce24fc8effb46b82fc4359810
parent2ff0d0b5bb397c3dc5c9b97bd0f20948f0b77740 (diff)
arm64: dts: marvell: armada-37xx: add second UART port
Add a node in Armada 37xx DTSI file for the second UART, with a different compatible due to its extended IP which has some differences with the first UART already in place. Make use of this commit to also fully describe the first port and use the same clear and named interrupt bindings for both ports. The standard UART (UART0) uses level-interrupts while the extended UART (UART1) uses edge-triggered interrupts. Signed-off-by: Miquel Raynal <miquel.raynal@free-electrons.com> Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
-rw-r--r--arch/arm64/boot/dts/marvell/armada-37xx.dtsi18
1 files changed, 17 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
index cddeb00a6e6d..90c26d616a54 100644
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
@@ -55,6 +55,7 @@
55 55
56 aliases { 56 aliases {
57 serial0 = &uart0; 57 serial0 = &uart0;
58 serial1 = &uart1;
58 }; 59 };
59 60
60 cpus { 61 cpus {
@@ -136,7 +137,22 @@
136 compatible = "marvell,armada-3700-uart"; 137 compatible = "marvell,armada-3700-uart";
137 reg = <0x12000 0x200>; 138 reg = <0x12000 0x200>;
138 clocks = <&xtalclk>; 139 clocks = <&xtalclk>;
139 interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; 140 interrupts =
141 <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,
142 <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
143 <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
144 interrupt-names = "uart-sum", "uart-tx", "uart-rx";
145 status = "disabled";
146 };
147
148 uart1: serial@12200 {
149 compatible = "marvell,armada-3700-uart-ext";
150 reg = <0x12200 0x30>;
151 clocks = <&xtalclk>;
152 interrupts =
153 <GIC_SPI 30 IRQ_TYPE_EDGE_RISING>,
154 <GIC_SPI 31 IRQ_TYPE_EDGE_RISING>;
155 interrupt-names = "uart-tx", "uart-rx";
140 status = "disabled"; 156 status = "disabled";
141 }; 157 };
142 158