| Message ID | 20171013090200.31034-15-miquel.raynal@free-electrons.com |
|---|---|
| State | New |
| Headers | show |
| Series | Support armada-37xx second UART port | expand |
Hi Miquel, On ven., oct. 13 2017, Miquel Raynal <miquel.raynal@free-electrons.com> wrote: > 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> Applied on mvebu/dt64 Thanks, Gregory > --- > arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 18 +++++++++++++++++- > 1 file changed, 17 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi > index a36d667f770e..72b68f23c001 100644 > --- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi > +++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi > @@ -55,6 +55,7 @@ > > aliases { > serial0 = &uart0; > + serial1 = &uart1; > }; > > cpus { > @@ -136,7 +137,22 @@ > compatible = "marvell,armada-3700-uart"; > reg = <0x12000 0x200>; > clocks = <&xtalclk>; > - interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; > + interrupts = > + <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-names = "uart-sum", "uart-tx", "uart-rx"; > + status = "disabled"; > + }; > + > + uart1: serial@12200 { > + compatible = "marvell,armada-3700-uart-ext"; > + reg = <0x12200 0x30>; > + clocks = <&xtalclk>; > + interrupts = > + <GIC_SPI 30 IRQ_TYPE_EDGE_RISING>, > + <GIC_SPI 31 IRQ_TYPE_EDGE_RISING>; > + interrupt-names = "uart-tx", "uart-rx"; > status = "disabled"; > }; > > -- > 2.11.0 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi index a36d667f770e..72b68f23c001 100644 --- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi @@ -55,6 +55,7 @@ aliases { serial0 = &uart0; + serial1 = &uart1; }; cpus { @@ -136,7 +137,22 @@ compatible = "marvell,armada-3700-uart"; reg = <0x12000 0x200>; clocks = <&xtalclk>; - interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; + interrupts = + <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "uart-sum", "uart-tx", "uart-rx"; + status = "disabled"; + }; + + uart1: serial@12200 { + compatible = "marvell,armada-3700-uart-ext"; + reg = <0x12200 0x30>; + clocks = <&xtalclk>; + interrupts = + <GIC_SPI 30 IRQ_TYPE_EDGE_RISING>, + <GIC_SPI 31 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "uart-tx", "uart-rx"; status = "disabled"; };