6a91557e4c
Do a couple things here: - Split the mega-patches into individual patches. Should help with rebasing. - Make all patches 'git am' acceptable. There should be no functional or actual code differences from before
47 lines
1.3 KiB
Diff
47 lines
1.3 KiB
Diff
From e2106f3eff00baedfe05e5e334731bd80465292e Mon Sep 17 00:00:00 2001
|
|
From: Robert Nelson <robertcnelson@gmail.com>
|
|
Date: Thu, 13 Mar 2014 14:18:52 -0500
|
|
Subject: [PATCH] arm: dts: am335x-bone-common: add
|
|
uart2_pins/uart4_pins/uart5_pins
|
|
|
|
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
|
|
---
|
|
arch/arm/boot/dts/am335x-bone-common.dtsi | 21 +++++++++++++++++++++
|
|
1 file changed, 21 insertions(+)
|
|
|
|
diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
|
|
index db4518ef755d..c983caab7d9b 100644
|
|
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
|
|
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
|
|
@@ -126,6 +126,27 @@
|
|
>;
|
|
};
|
|
|
|
+ uart2_pins: pinmux_uart2_pins {
|
|
+ pinctrl-single,pins = <
|
|
+ 0x150 0x21 /* spi0_sclk.uart2_rxd | MODE1 */
|
|
+ 0x154 0x01 /* spi0_d0.uart2_txd | MODE1 */
|
|
+ >;
|
|
+ };
|
|
+
|
|
+ uart4_pins: pinmux_uart4_pins {
|
|
+ pinctrl-single,pins = <
|
|
+ 0x070 0x26 /* gpmc_wait0.uart4_rxd | MODE6 */
|
|
+ 0x074 0x06 /* gpmc_wpn.uart4_txd | MODE6 */
|
|
+ >;
|
|
+ };
|
|
+
|
|
+ uart5_pins: pinmux_uart5_pins {
|
|
+ pinctrl-single,pins = <
|
|
+ 0x0C4 0x24 /* lcd_data9.uart5_rxd | MODE4 */
|
|
+ 0x0C0 0x04 /* lcd_data8.uart5_txd | MODE4 */
|
|
+ >;
|
|
+ };
|
|
+
|
|
clkout2_pin: pinmux_clkout2_pin {
|
|
pinctrl-single,pins = <
|
|
0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */
|
|
--
|
|
1.9.3
|
|
|