From patchwork Fri Jun 12 15:47:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Lunn X-Patchwork-Id: 6599161 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0EB209F399 for ; Fri, 12 Jun 2015 15:56:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1B86E20658 for ; Fri, 12 Jun 2015 15:56:31 +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 B1E3C20558 for ; Fri, 12 Jun 2015 15:56:29 +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 1Z3RGl-0006w6-G7; Fri, 12 Jun 2015 15:53:23 +0000 Received: from vps0.lunn.ch ([178.209.37.122]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Z3RGh-0006uz-BX for linux-arm-kernel@lists.infradead.org; Fri, 12 Jun 2015 15:53:20 +0000 Received: from andrew by vps0.lunn.ch with local (Exim 4.80) (envelope-from ) id 1Z3RAo-0003bZ-Kt; Fri, 12 Jun 2015 17:47:14 +0200 From: Andrew Lunn To: shawn.guo@linaro.org Subject: [PATCH] ARM: dts: vf610: Nomenclature fixup for PTA6 pin used in RMII mode. Date: Fri, 12 Jun 2015 17:47:13 +0200 Message-Id: <1434124033-13820-1-git-send-email-andrew@lunn.ch> X-Mailer: git-send-email 1.7.10.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150612_085319_568594_21964EA2 X-CRM114-Status: UNSURE ( 8.07 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) Cc: Andrew Lunn , Cory Tusar , linux ARM , stefan@agner.ch 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add a missing _ENET_ infix to PTA6 when used in RMII mode. This makes it consistent with all other pinctrl aliases for Ethernet. Signed-off-by: Andrew Lunn --- arch/arm/boot/dts/vf-colibri.dtsi | 2 +- arch/arm/boot/dts/vf610-pinfunc.h | 8 ++++---- arch/arm/boot/dts/vf610-twr.dts | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/vf-colibri.dtsi b/arch/arm/boot/dts/vf-colibri.dtsi index 68ca125b56ea..8e09b9f34a99 100644 --- a/arch/arm/boot/dts/vf-colibri.dtsi +++ b/arch/arm/boot/dts/vf-colibri.dtsi @@ -136,7 +136,7 @@ pinctrl_fec1: fec1grp { fsl,pins = < - VF610_PAD_PTA6__RMII_CLKOUT 0x30d2 + VF610_PAD_PTA6__ENET_RMII_CLKOUT 0x30d2 VF610_PAD_PTC9__ENET_RMII1_MDC 0x30d2 VF610_PAD_PTC10__ENET_RMII1_MDIO 0x30d3 VF610_PAD_PTC11__ENET_RMII1_CRS 0x30d1 diff --git a/arch/arm/boot/dts/vf610-pinfunc.h b/arch/arm/boot/dts/vf610-pinfunc.h index fcad7132c871..61ccf6dfd1a7 100644 --- a/arch/arm/boot/dts/vf610-pinfunc.h +++ b/arch/arm/boot/dts/vf610-pinfunc.h @@ -26,8 +26,8 @@ #define VF610_PAD_PTA6__GPIO_0 0x000 0x000 ALT0 0x0 -#define VF610_PAD_PTA6__RMII_CLKOUT 0x000 0x000 ALT1 0x0 -#define VF610_PAD_PTA6__RMII_CLKIN 0x000 0x2F0 ALT2 0x0 +#define VF610_PAD_PTA6__ENET_RMII_CLKOUT 0x000 0x000 ALT1 0x0 +#define VF610_PAD_PTA6__ENET_RMII_CLKIN 0x000 0x2F0 ALT2 0x0 #define VF610_PAD_PTA6__DCU1_TCON11 0x000 0x000 ALT4 0x0 #define VF610_PAD_PTA6__DCU1_R2 0x000 0x000 ALT7 0x0 #define VF610_PAD_PTA8__GPIO_1 0x004 0x000 ALT0 0x0 @@ -36,8 +36,8 @@ #define VF610_PAD_PTA8__MLB_CLK 0x004 0x354 ALT7 0x0 #define VF610_PAD_PTA9__GPIO_2 0x008 0x000 ALT0 0x0 #define VF610_PAD_PTA9__TDI 0x008 0x000 ALT1 0x0 -#define VF610_PAD_PTA9__RMII_CLKOUT 0x008 0x000 ALT2 0x0 -#define VF610_PAD_PTA9__RMII_CLKIN 0x008 0x2F0 ALT3 0x1 +#define VF610_PAD_PTA9__ENET_RMII_CLKOUT 0x008 0x000 ALT2 0x0 +#define VF610_PAD_PTA9__ENET_RMII_CLKIN 0x008 0x2F0 ALT3 0x1 #define VF610_PAD_PTA9__DCU0_R1 0x008 0x000 ALT4 0x0 #define VF610_PAD_PTA9__WDOG_B 0x008 0x000 ALT6 0x0 #define VF610_PAD_PTA10__GPIO_3 0x00C 0x000 ALT0 0x0 diff --git a/arch/arm/boot/dts/vf610-twr.dts b/arch/arm/boot/dts/vf610-twr.dts index 375ab23ca743..3f8e1b133bd1 100644 --- a/arch/arm/boot/dts/vf610-twr.dts +++ b/arch/arm/boot/dts/vf610-twr.dts @@ -203,7 +203,7 @@ pinctrl_fec0: fec0grp { fsl,pins = < - VF610_PAD_PTA6__RMII_CLKIN 0x30d1 + VF610_PAD_PTA6__ENET_RMII_CLKIN 0x30d1 VF610_PAD_PTC0__ENET_RMII0_MDC 0x30d3 VF610_PAD_PTC1__ENET_RMII0_MDIO 0x30d1 VF610_PAD_PTC2__ENET_RMII0_CRS 0x30d1