From patchwork Thu Jan 24 16:07:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2033491 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 29AD5DF264 for ; Thu, 24 Jan 2013 16:11:38 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TyPMZ-00071n-Fh; Thu, 24 Jan 2013 16:09:15 +0000 Received: from moutng.kundenserver.de ([212.227.126.187]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TyPLG-0005t2-SV for linux-arm-kernel@lists.infradead.org; Thu, 24 Jan 2013 16:07:55 +0000 Received: from axis700.grange (dslb-094-221-098-036.pools.arcor-ip.net [94.221.98.36]) by mrelayeu.kundenserver.de (node=mrbap4) with ESMTP (Nemesis) id 0M8ztN-1UAFqU3jVF-00CQhn; Thu, 24 Jan 2013 17:07:44 +0100 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id 7AC2E40B9C; Thu, 24 Jan 2013 17:07:43 +0100 (CET) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1TyPL5-0002y7-8E; Thu, 24 Jan 2013 17:07:43 +0100 From: Guennadi Liakhovetski To: linux-sh@vger.kernel.org Subject: [PATCH 3/3] ARM: shmobile: move pin configuration on armadillo800eva-reference to DT Date: Thu, 24 Jan 2013 17:07:33 +0100 Message-Id: <1359043653-11374-4-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1359043653-11374-1-git-send-email-g.liakhovetski@gmx.de> References: <1359043653-11374-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:qwaggLvt8UeTi2Cz+XqaXq6Y+G25gu98vIRZFjYfaRE /xtN4Oj50r4NsiR7pb1cZ6HB9qoB4kBfAFY+b9WMrJdkc6L/6F Qiwb/61HW4aC9wre3xBMhQ79pPqagSaOmSv2mK/D5LG3ug7wqF TqtQ5SOtLjKglRZxcLj955WnC3Bb5TqgeuJBt+jEmq9hdwa2Yr xJjRubiU6UF7tI8ODsDqwvDWShzrtNuhNaYLvjo639cup6YTZ5 +3saOw4SJhrYU/xs2GQuFM3l5r91AxErKldv8PH8r8x7XKA0jW kxwbfsAhnHKBMmqI/KYN8L4u8BnHNUA94UV6o1qSe6/yH3a4oj 0Ho8Ec4RM8GL0u7T2BCCzA+5bmZjec9RlTpOTIi6XaSRIvQsDz K3S1tBXsMQAEQ== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130124_110755_183912_3EA3573E X-CRM114-Status: GOOD ( 10.13 ) 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 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.187 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (g.liakhovetski[at]gmx.de) -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: Simon Horman , Magnus Damm , Guennadi Liakhovetski , linux-arm-kernel@lists.infradead.org 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 Use pinctrl and sh-eth DT bindings to configure sh-eth MAC pins on armadillo800eva in reference implementation. Signed-off-by: Guennadi Liakhovetski --- .../boot/dts/r8a7740-armadillo800eva-reference.dts | 7 +++++ .../board-armadillo800eva-reference.c | 24 -------------------- 2 files changed, 7 insertions(+), 24 deletions(-) diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts index 11cb0f9..b815ffd9 100644 --- a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts +++ b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts @@ -26,9 +26,12 @@ reg = <0xe9a00000 0x800>, <0xe9a01800 0x800>; interrupts = <0x500>; phy-mode = "mii"; + phy-reset-gpios = <&gpio 18 1>; sh-eth,edmac-endian = "little"; sh-eth,register-type = "gigabit"; sh-eth,phy-id = <0>; + pinctrl-names = "default"; + pinctrl-0 = <ð_pins>; }; reg_3p3v: regulator@0 { @@ -137,4 +140,8 @@ renesas,pins = "mmc0_data8_1", "mmc0_ctrl_1"; renesas,function = "mmc0"; }; + eth_pins: pfc_eth_pins { + renesas,pins = "eth_base"; + renesas,function = "eth"; + }; }; diff --git a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c index 92d7106..54ec573e 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c @@ -152,30 +152,6 @@ static void __init eva_init(void) gpio_request(GPIO_FN_SCIFA1_RXD, NULL); gpio_request(GPIO_FN_SCIFA1_TXD, NULL); - /* GETHER */ - gpio_request(GPIO_FN_ET_CRS, NULL); - gpio_request(GPIO_FN_ET_MDC, NULL); - gpio_request(GPIO_FN_ET_MDIO, NULL); - gpio_request(GPIO_FN_ET_TX_ER, NULL); - gpio_request(GPIO_FN_ET_RX_ER, NULL); - gpio_request(GPIO_FN_ET_ERXD0, NULL); - gpio_request(GPIO_FN_ET_ERXD1, NULL); - gpio_request(GPIO_FN_ET_ERXD2, NULL); - gpio_request(GPIO_FN_ET_ERXD3, NULL); - gpio_request(GPIO_FN_ET_TX_CLK, NULL); - gpio_request(GPIO_FN_ET_TX_EN, NULL); - gpio_request(GPIO_FN_ET_ETXD0, NULL); - gpio_request(GPIO_FN_ET_ETXD1, NULL); - gpio_request(GPIO_FN_ET_ETXD2, NULL); - gpio_request(GPIO_FN_ET_ETXD3, NULL); - gpio_request(GPIO_FN_ET_PHY_INT, NULL); - gpio_request(GPIO_FN_ET_COL, NULL); - gpio_request(GPIO_FN_ET_RX_DV, NULL); - gpio_request(GPIO_FN_ET_RX_CLK, NULL); - - gpio_request(GPIO_PORT18, NULL); /* PHY_RST */ - gpio_direction_output(GPIO_PORT18, 1); - #ifdef CONFIG_CACHE_L2X0 /* Early BRESP enable, Shared attribute override enable, 32K*8way */ l2x0_init(IOMEM(0xf0002000), 0x40440000, 0x82000fff);