From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans de Goede Subject: [PATCH 3/3] ARM: dts: sun7i: Add uart4 support for BananaPro, disable uart2 Date: Thu, 21 May 2015 14:32:35 +0200 Message-ID: <1432211555-25078-3-git-send-email-hdegoede@redhat.com> References: <1432211555-25078-1-git-send-email-hdegoede@redhat.com> Reply-To: hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Return-path: In-Reply-To: <1432211555-25078-1-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , To: Maxime Ripard Cc: Michael Ring , linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, devicetree , linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org, Hans de Goede List-Id: devicetree@vger.kernel.org From: Michael Ring The BananaPro uses uart4 for the default rx/tx pins on the 40 pins connector, so enable uart4. Uart2 is also available at the bananapro io-pins, but like on the bananapi the primary function of the pins is to act as gpios, see: http://forum.lemaker.org/forum.php?mod=viewthread&tid=10852 Disable the uart2 node by default, but leave it in place so that people can easily enable it. Signed-off-by: Michael Ring [hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org: Disable uart2 by default] Signed-off-by: Hans de Goede --- arch/arm/boot/dts/sun7i-a20-bananapro.dts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/sun7i-a20-bananapro.dts index 45e2a02..4edb8a4 100644 --- a/arch/arm/boot/dts/sun7i-a20-bananapro.dts +++ b/arch/arm/boot/dts/sun7i-a20-bananapro.dts @@ -52,8 +52,9 @@ aliases { serial0 = &uart0; - serial1 = &uart2; + serial1 = &uart4; serial2 = &uart7; + serial3 = &uart2; }; chosen { @@ -253,6 +254,12 @@ &uart2 { pinctrl-names = "default"; pinctrl-0 = <&uart2_pins_a>; + status = "disabled"; +}; + +&uart4 { + pinctrl-names = "default"; + pinctrl-0 = <&uart4_pins_b>; status = "okay"; }; -- 2.4.1