diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2015-01-25 15:25:14 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2015-01-25 15:25:14 +0000 |
commit | afa58d858975de2231afe01dcfcc03e5ad4f78c9 (patch) | |
tree | 3599cb1305414a0a9530141a942f9099f3820578 /target/linux/mvebu/patches-3.18/016-common_armada_xp_uart2_3_pinctrl.patch | |
parent | d26694243af236fed09a4b38f3cc68e40ad063b5 (diff) | |
download | upstream-afa58d858975de2231afe01dcfcc03e5ad4f78c9.tar.gz upstream-afa58d858975de2231afe01dcfcc03e5ad4f78c9.tar.bz2 upstream-afa58d858975de2231afe01dcfcc03e5ad4f78c9.zip |
mvebu: backport some upstream changes
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 44127
Diffstat (limited to 'target/linux/mvebu/patches-3.18/016-common_armada_xp_uart2_3_pinctrl.patch')
-rw-r--r-- | target/linux/mvebu/patches-3.18/016-common_armada_xp_uart2_3_pinctrl.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/target/linux/mvebu/patches-3.18/016-common_armada_xp_uart2_3_pinctrl.patch b/target/linux/mvebu/patches-3.18/016-common_armada_xp_uart2_3_pinctrl.patch new file mode 100644 index 0000000000..2d289706ad --- /dev/null +++ b/target/linux/mvebu/patches-3.18/016-common_armada_xp_uart2_3_pinctrl.patch @@ -0,0 +1,52 @@ +From d352f41e87e7226692d1346bb97c603615eeb817 Mon Sep 17 00:00:00 2001 +From: Arnaud Ebalard <arno@natisbad.org> +Date: Sat, 22 Nov 2014 00:46:28 +0100 +Subject: arm: mvebu: define and use common Armada XP UART2/3 pinctrl settings + +This patch defines common Armada XP pinctrl settings for uart2 and +uart3 interfaces (uart0 and uart1 rx/tx do not rely on MPP): + + uart2: MPP42-43 as default + uart3: MPP44-45 as default + +Suggested-by: Andrew Lunn <andrew@lunn.ch> +Acked-by: Andrew Lunn <andrew@lunn.ch> +Signed-off-by: Arnaud Ebalard <arno@natisbad.org> +Link: https://lkml.kernel.org/r/fd51c080c7139a67ec01df8d797f1e88ce557796.1416613429.git.arno@natisbad.org +Signed-off-by: Jason Cooper <jason@lakedaemon.net> + +--- a/arch/arm/boot/dts/armada-xp.dtsi ++++ b/arch/arm/boot/dts/armada-xp.dtsi +@@ -55,6 +55,8 @@ + + uart2: serial@12200 { + compatible = "snps,dw-apb-uart"; ++ pinctrl-0 = <&uart2_pins>; ++ pinctrl-names = "default"; + reg = <0x12200 0x100>; + reg-shift = <2>; + interrupts = <43>; +@@ -65,6 +67,8 @@ + + uart3: serial@12300 { + compatible = "snps,dw-apb-uart"; ++ pinctrl-0 = <&uart3_pins>; ++ pinctrl-names = "default"; + reg = <0x12300 0x100>; + reg-shift = <2>; + interrupts = <44>; +@@ -235,4 +239,14 @@ + "mpp33", "mpp34", "mpp35"; + marvell,function = "sd0"; + }; ++ ++ uart2_pins: uart2-pins { ++ marvell,pins = "mpp42", "mpp43"; ++ marvell,function = "uart2"; ++ }; ++ ++ uart3_pins: uart3-pins { ++ marvell,pins = "mpp44", "mpp45"; ++ marvell,function = "uart3"; ++ }; + }; |