From patchwork Sat Nov 22 16:19:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 5359591 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D4D339F39B for ; Sat, 22 Nov 2014 16:19:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0B2462014A for ; Sat, 22 Nov 2014 16:19:20 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3BA8820149 for ; Sat, 22 Nov 2014 16:19:19 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XsDNC-0006Yj-S6; Sat, 22 Nov 2014 16:17:22 +0000 Received: from 36.223.133.77.rev.sfr.net ([77.133.223.36] helo=smtp.natisbad.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XsDN1-0006U5-L6 for linux-arm-kernel@lists.infradead.org; Sat, 22 Nov 2014 16:17:12 +0000 Received: by smtp.natisbad.org (Postfix, from userid 109) id 129EE17004C5; Sat, 22 Nov 2014 17:16:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1416672997; bh=vlEdzUmSKlohP8tr/pIcjKGFeAseef3Ay4FZq9/9UfI=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=jbHTkA36huFElTeNrXUyOujiaUhlhW9heIVlfQJSc37YRPuf0LVfMr2Z1sOgEVKZv UUL2y7PGp+ugARLKaott0JTNiA7TSU3o7cuS4xWqxbvMFpxFoF9gl44QATPUIQMVTL anx6/8vh8klnvudBhd7XKDRJ8yylsR6lGkNXv/I0= X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from small (localhost [IPv6:::1]) by smtp.natisbad.org (Postfix) with ESMTP id E54341700420; Sat, 22 Nov 2014 17:16:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1416672986; bh=vlEdzUmSKlohP8tr/pIcjKGFeAseef3Ay4FZq9/9UfI=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=EtSrK0lcdPlvYeYnHpzjYzaCKTQTwo/OuvguHWN0Q/A1YCGfeyfJFk0rYlvAaEeEF OH0fPTRgxlXBWwbahDXYTGKBq2gfnOOEOF7KpujkKEBhwgMkAX/SNV6TxMPiW+omSC 32EZf942FCmD/Dzyt/dzAfIRN/dFhJ9nK8vCZt10= X-Hashcash: 1:20:141122:jason@lakedaemon.net::48hKmtqGpm5TNTUb:000000000000000000000000000000000000000002AxU X-Hashcash: 1:20:141122:andrew@lunn.ch::ry3CEYGwr83YKGF0:00014aY X-Hashcash: 1:20:141122:gregory.clement@free-electrons.com::fe2qZrn4WK7K0a9a:0000000000000000000000000000Tl0 X-Hashcash: 1:20:141122:sebastian.hesselbarth@gmail.com::WWdhSzEiMWB+XNoo:00000000000000000000000000000007zk X-Hashcash: 1:20:141122:klightspeed@killerwolves.net::V2IQ64kcK6Mu/Xhh:000000000000000000000000000000000DnHL X-Hashcash: 1:20:141122:linux@arm.linux.org.uk::jq83t5gian+ZoaZ+:0000000000000000000000000000000000000004yU+ X-Hashcash: 1:20:141122:linux-arm-kernel@lists.infradead.org::+5vwagFIXDDq9KTP:00000000000000000000000005Z5v X-Hashcash: 1:20:141122:rob.herring@calxeda.com::bak6ChF9UygXBEmz:000000000000000000000000000000000000000Y3+ X-Hashcash: 1:20:141122:pawel.moll@arm.com::FbAThtrz/ZK9SzTV:00000000000000000000000000000000000000000004vo7 X-Hashcash: 1:20:141122:mark.rutland@arm.com::yu0Uk5gKifqtWLTI:000000000000000000000000000000000000000005swr X-Hashcash: 1:20:141122:swarren@wwwdotorg.org::pYs9SN9m4q9QZgmg:00000000000000000000000000000000000000002A8q X-Hashcash: 1:20:141122:ijc+devicetree@hellion.org.uk::64WCKMx3F1BAZd5w:000000000000000000000000000000007Xr/ X-Hashcash: 1:20:141122:devicetree@vger.kernel.org::DXhIMwSl1JSRZeGK:0000000000000000000000000000000000043oB From: Arnaud Ebalard To: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Ben Peddell Subject: [PATCHv0 1/2] arm: mvebu: fix wrongly named DS414 pinctrl entries In-Reply-To: References: Message-Id: <608e4fd6e06e9c5289a84b9c38e81b2456dbcd79.1416670812.git.arno@natisbad.org> Date: Sat, 22 Nov 2014 17:19:50 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141122_081712_021253_07D0167D X-CRM114-Status: UNSURE ( 8.18 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.3 (/) Cc: Mark Rutland , devicetree@vger.kernel.org, Russell King , Pawel Moll , Stephen Warren , Ian Campbell , Rob Herring , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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 X-Virus-Scanned: ClamAV using ClamSMTP While renaming pinctrl entries during reviews of Synology DS414 support series, I missed three entries, as reported by Ben. This patch fixes those. Reported-by: Ben Peddell Signed-off-by: Arnaud Ebalard --- arch/arm/boot/dts/armada-xp-synology-ds414.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/armada-xp-synology-ds414.dts b/arch/arm/boot/dts/armada-xp-synology-ds414.dts index ba5e94d27c21..97cbf980c54d 100644 --- a/arch/arm/boot/dts/armada-xp-synology-ds414.dts +++ b/arch/arm/boot/dts/armada-xp-synology-ds414.dts @@ -308,17 +308,17 @@ marvell,function = "gpio"; }; - pmx_syno_id_bit1: syno-id-bit1-pin { + syno_id_bit1_pin: syno-id-bit1-pin { marvell,pins = "mpp28"; marvell,function = "gpio"; }; - pmx_syno_id_bit2: syno-id-bit2-pin { + syno_id_bit2_pin: syno-id-bit2-pin { marvell,pins = "mpp29"; marvell,function = "gpio"; }; - pmx_fan1_alarm: fan1-alarm-pin { + fan1_alarm_pin: fan1-alarm-pin { marvell,pins = "mpp33"; marvell,function = "gpio"; };