Merge tag 'mvebu-dt64-4.15-2' of git://git.infradead.org/linux-mvebu into next/dt

Pull "mvebu dt64 for 4.15 (part 2)" from Gregory CLEMENT:

Add the extended UART support on Armada 3700

* tag 'mvebu-dt64-4.15-2' of git://git.infradead.org/linux-mvebu:
  arm64: dts: marvell: armada-3720-espressobin: fill UART nodes
  arm64: dts: marvell: armada-3720-db: enable second UART port
  arm64: dts: marvell: armada-37xx: add second UART port
  arm64: dts: marvell: armada-37xx: add UART clock

diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
index e6e0f38ce6e15913baf8d184ad2077a7812ccbbc..0f3468e777f790d47c45264b6eb0e76737f03389 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
@@ -227,7 +227,7 @@ partition@210000 {
 
 /*
  * Exported on the micro USB connector CON30(V2.0)/CON32(V1.4) through
- * an FTDI
+ * an FTDI (also on CON24(V2.0)/CON26(V1.4)).
  */
 &uart0 {
        pinctrl-names = "default";
@@ -235,6 +235,13 @@ &uart0 {
        status = "okay";
 };
 
+/* CON26(V2.0)/CON28(V1.4) */
+&uart1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&uart2_pins>;
+       status = "okay";
+};
+
 /* CON27(V2.0)/CON29(V1.4) */
 &usb2 {
        status = "okay";

diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
index 2ce52ba74f73bac47244aaa5896f29ed4b56596a..bdfb5553ddb52d74847cedcec1ad0a1671cfa895 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
@@ -98,9 +98,21 @@ &sdhci1 {
 
 /* Exported on the micro USB connector J5 through an FTDI */
 &uart0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&uart1_pins>;
        status = "okay";
 };
 
+/*
+ * Connector J17 and J18 expose a number of different features. Some pins are
+ * multiplexed. This is the case for instance for the following features:
+ * - UART1 (pin 24 = RX, pin 26 = TX). See armada-3720-db.dts for an example of
+ *   how to enable it. Beware that the signals are 1.8V TTL.
+ * - I2C
+ * - SPI
+ * - MMC
+ */
+
 /* J7 */
 &usb3 {
        status = "okay";

diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
index d436ed9c5af2e777bec084840df944192ddc6de6..90c26d616a5418f54243906bb851dc89883cea9f 100644 (file)
--- 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 {
@@ -135,7 +136,23 @@ i2c1: i2c@11080 {
                        uart0: serial@12000 {
                                compatible = "marvell,armada-3700-uart";
                                reg = <0x12000 0x200>;
-                               interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&xtalclk>;
+                               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";
                        };