Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cdc614b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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
parents 0b30cf2f c3c08c5d

arch/arm64/boot/dts/marvell/armada-3720-db.dts

+8 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ 


/*

 * 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 @@ 
	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";

arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts

+12 −0
Original line number Diff line number Diff line
@@ -98,9 +98,21 @@ 


/* 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";

arch/arm64/boot/dts/marvell/armada-37xx.dtsi

+18 −1
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 


	aliases {

		serial0 = &uart0;

		serial1 = &uart1;

	};



	cpus {
@@ -135,7 +136,23 @@ 
			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";

			};