From patchwork Fri Mar 8 11:18:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Emilio_L=C3=B3pez?= X-Patchwork-Id: 2236821 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id ACD0E4006E for ; Fri, 8 Mar 2013 11:23:38 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UDvKv-0008CN-Aq; Fri, 08 Mar 2013 11:19:41 +0000 Received: from avas-mr18.fibertel.com.ar ([24.232.0.121]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UDvKp-0008BZ-8o for linux-arm-kernel@lists.infradead.org; Fri, 08 Mar 2013 11:19:37 +0000 Received: from 201-212-118-238.prima.net.ar ([201.212.118.238]:44993 "EHLO desktop.lan" smtp-auth: "elopez" rhost-flags-OK-OK-OK-FAIL) by avas-mr18.fibertel.com.ar with ESMTPA id S751488Ab3CHLTP; Fri, 8 Mar 2013 08:19:15 -0300 From: =?UTF-8?q?Emilio=20L=C3=B3pez?= To: Subject: [PATCH] ARM: sunxi: cubieboard: Add UART muxing Date: Fri, 8 Mar 2013 08:18:56 -0300 Message-Id: <1362741536-12632-1-git-send-email-emilio@elopez.com.ar> X-Mailer: git-send-email 1.8.1.5 MIME-Version: 1.0 X-Fib-Al-Info: Al X-Fib-Al-MRId: f39fd6cc804713bd68664ff580cf340b X-Fib-Al: noav X-Fib-Al-SA: analyzed X-Fib-Al-From: emilio@elopez.com.ar X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130308_061935_740809_0FE26B88 X-CRM114-Status: UNSURE ( 7.47 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 1.3 (+) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (1.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [24.232.0.121 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.5 TAB_IN_FROM From starts with a tab 2.8 KB_DATE_CONTAINS_TAB KB_DATE_CONTAINS_TAB Cc: =?UTF-8?q?Emilio=20L=C3=B3pez?= , Maxime Ripard X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org We previously relied on the bootloader to do the muxing of the UART for the Cubieboard. Don't rely on it anymore and use pinctrl. Also remove uart1, as it is not enabled by default and it's not exposed on the board headers. Signed-off-by: Emilio López --- This is a followup patch to Maxime Ripard's "Extend UART support for Allwinner SoCs" series. arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts index 88e2dc1..dc760d0 100644 --- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts +++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts @@ -37,10 +37,8 @@ }; uart0: uart@01c28000 { - status = "okay"; - }; - - uart1: uart@01c28400 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins_a>; status = "okay"; }; };