summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorBill Pringlemeir <bpringlemeir@nbsps.com>2014-08-05 17:34:01 (GMT)
committerShawn Guo <shawn.guo@freescale.com>2014-09-16 02:25:52 (GMT)
commitd8c99930f1402931809f6da2dfd42d56c620e0d7 (patch)
tree63d1b985a0031bb916e647ea0d3eb4fcc6c65308 /arch/arm
parent2998b332b8a8e727637f3a5811ed46a31124380c (diff)
downloadlinux-d8c99930f1402931809f6da2dfd42d56c620e0d7.tar.xz
ARM: dts: vf610-twr: Add ttyLP2 device.
The ttyLP1 is already the default console/serial port. The tower board will route ttyLP2 to the same connectors depending on the JP23/24 settings. See: http://lists.infradead.org/pipermail/linux-arm-kernel/2014-July/276457.html http://lists.infradead.org/pipermail/linux-arm-kernel/2014-July/275576.html Signed-off-by: Bill Pringlemeir <bpringlemeir@nbsps.com> Acked-by: Stefan Agner <stefan@agner.ch> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/vf610-twr.dts15
1 files changed, 13 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/vf610-twr.dts b/arch/arm/boot/dts/vf610-twr.dts
index e4bffba..82d16ac 100644
--- a/arch/arm/boot/dts/vf610-twr.dts
+++ b/arch/arm/boot/dts/vf610-twr.dts
@@ -220,8 +220,6 @@
VF610_PAD_PTB1__FTM0_CH1 0x1582
VF610_PAD_PTB2__FTM0_CH2 0x1582
VF610_PAD_PTB3__FTM0_CH3 0x1582
- VF610_PAD_PTB6__FTM0_CH6 0x1582
- VF610_PAD_PTB7__FTM0_CH7 0x1582
>;
};
@@ -243,6 +241,13 @@
VF610_PAD_PTB5__UART1_RX 0x21a1
>;
};
+
+ pinctrl_uart2: uart2grp {
+ fsl,pins = <
+ VF610_PAD_PTB6__UART2_TX 0x21a2
+ VF610_PAD_PTB7__UART2_RX 0x21a1
+ >;
+ };
};
};
@@ -264,3 +269,9 @@
pinctrl-0 = <&pinctrl_uart1>;
status = "okay";
};
+
+&uart2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_uart2>;
+ status = "okay";
+};