diff options
author | 2013-08-21 14:44:54 +0200 | |
---|---|---|
committer | 2013-08-21 14:44:54 +0200 | |
commit | fac778a2b8d6ca953d440baeee72901c2dd5aad9 (patch) | |
tree | c43d780b5ff8819f4353b16c99601c5ceeeacad7 /arch/arm/boot/dts/stih416-pinctrl.dtsi | |
parent | ARM: clocksource: Add support for MOXA ART SoCs (diff) | |
parent | proc: return on proc_readdir error (diff) | |
download | linux-dev-fac778a2b8d6ca953d440baeee72901c2dd5aad9.tar.xz linux-dev-fac778a2b8d6ca953d440baeee72901c2dd5aad9.zip |
Merge branch 'linus' into timers/core
Reason: Get upstream changes on which new patches depend on.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/arm/boot/dts/stih416-pinctrl.dtsi')
-rw-r--r-- | arch/arm/boot/dts/stih416-pinctrl.dtsi | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/stih416-pinctrl.dtsi b/arch/arm/boot/dts/stih416-pinctrl.dtsi index 957b21a71b4b..0f246c979262 100644 --- a/arch/arm/boot/dts/stih416-pinctrl.dtsi +++ b/arch/arm/boot/dts/stih416-pinctrl.dtsi @@ -166,6 +166,15 @@ reg = <0x9000 0x100>; st,bank-name = "PIO31"; }; + + serial2-oe { + pinctrl_serial2_oe: serial2-1 { + st,pins { + output-enable = <&PIO11 3 ALT2 OUT>; + }; + }; + }; + }; pin-controller-rear { @@ -218,7 +227,6 @@ st,pins { tx = <&PIO17 4 ALT2 OUT>; rx = <&PIO17 5 ALT2 IN>; - output-enable = <&PIO11 3 ALT2 OUT>; }; }; }; |