summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiquel Raynal <miquel.raynal@free-electrons.com>2017-10-13 11:02:00 +0200
committerGregory CLEMENT <gregory.clement@free-electrons.com>2017-10-30 15:56:34 +0100
commitc3c08c5d32d819a73f75a76b315e229a2081680a (patch)
tree15d95dd9247baccfda3931178a6c98b6046339f5
parent71e278ce814d9ffc9d02fed76ed9a40ce4aaffcd (diff)
downloadlinux-stable-c3c08c5d32d819a73f75a76b315e229a2081680a.tar.gz
linux-stable-c3c08c5d32d819a73f75a76b315e229a2081680a.tar.bz2
linux-stable-c3c08c5d32d819a73f75a76b315e229a2081680a.zip
arm64: dts: marvell: armada-3720-espressobin: fill UART nodes
Fill ESPRESSObin uart0 node with pinctrl information like in the Armada-3720-DB device tree (which uses the same node). Also explain how to enable the second UART port available on the headers. This second port is not enabled by default because both headers are dedicated to expose general purpose pins and remapping some of them to use the second UART would break existing users. Suggested-by: László ÁSHIN <laszlo@ashin.hu> Signed-off-by: Miquel Raynal <miquel.raynal@free-electrons.com> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
-rw-r--r--arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
index 2ce52ba74f73..bdfb5553ddb5 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
@@ -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";