From patchwork Sat Jan 26 16:55:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Lunn X-Patchwork-Id: 2049941 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 00D0FDF23A for ; Sat, 26 Jan 2013 16:59:12 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Tz92h-0000xX-J2; Sat, 26 Jan 2013 16:55:47 +0000 Received: from londo.lunn.ch ([2001:1620:f9f:1000::1]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Tz92f-0000wn-Mx for linux-arm-kernel@lists.infradead.org; Sat, 26 Jan 2013 16:55:46 +0000 Received: from lunn by londo.lunn.ch with local (Exim 3.36 #1 (Debian)) id 1Tz92S-0001YG-00; Sat, 26 Jan 2013 17:55:32 +0100 From: Andrew Lunn To: Jason Cooper Subject: [PATCH 1/2] ARM: Kirkwood: topkick: Fix SoC type and add missing pins Date: Sat, 26 Jan 2013 17:55:24 +0100 Message-Id: <1359219326-5927-1-git-send-email-andrew@lunn.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130126_115545_914948_CFBB8DF6 X-CRM114-Status: UNSURE ( 8.26 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Andrew Lunn , linux ARM X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Topkick contains a Marvell 6282, not an 6281 as included in the kirkwood-topkick.dts file. Also, add pinhogs for the serial port and nand devices. Signed-off-by: Andrew Lunn --- arch/arm/boot/dts/kirkwood-topkick.dts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts index edefbb5..c8e8a64 100644 --- a/arch/arm/boot/dts/kirkwood-topkick.dts +++ b/arch/arm/boot/dts/kirkwood-topkick.dts @@ -1,7 +1,7 @@ /dts-v1/; /include/ "kirkwood.dtsi" -/include/ "kirkwood-6281.dtsi" +/include/ "kirkwood-6282.dtsi" / { model = "Univeral Scientific Industrial Co. Topkick-1281P2"; @@ -50,7 +50,9 @@ &pmx_sw_right &pmx_sw_idle &pmx_sw_left2 - &pmx_led_wifi_yellow >; + &pmx_led_wifi_yellow + &pmx_uart0 + &pmx_nand >; pinctrl-names = "default"; pmx_led_disk_yellow: pmx-led-disk-yellow {