From patchwork Thu Oct 18 16:48:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 10647629 X-Patchwork-Delegate: horms@verge.net.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 005721508 for ; Thu, 18 Oct 2018 16:48:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E60F1289F6 for ; Thu, 18 Oct 2018 16:48:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E43D328F38; Thu, 18 Oct 2018 16:48:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D93B289F6 for ; Thu, 18 Oct 2018 16:48:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728539AbeJSAuq (ORCPT ); Thu, 18 Oct 2018 20:50:46 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:41622 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728532AbeJSAuq (ORCPT ); Thu, 18 Oct 2018 20:50:46 -0400 Received: by mail-lj1-f193.google.com with SMTP id u21-v6so28331899lja.8 for ; Thu, 18 Oct 2018 09:48:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=from:subject:to:cc:references:organization:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=JqvywLpoA32Tsu3bU9iTxNc2SYugj6jiSRlu/g5vyt8=; b=eOuTC66cUfcsv7h76Jvbm0joyUYAu6SRk+dbNbg4im1su5JAk0Gt5NzT9qNjhvgEPW yTX2rrjA2c7OeYyaWlrA9GwOBQhBDm9hM4uXjuf45GdFY6usoA+0k7AFiWvEt3HxXned CgBoa6OnuySQU+C82Yqd7fbAMX0vlYpSW2bh/FFSh3PG1QDcJYFzl282pHJVrDy2IdK2 ChRDjZ7FTl8dz5NE2s7M4gSxwJ3WEH/awcVlkzn0jymAxtz46Em7xr1VZvA/IQP0f+hl 6Vpz794AfTElqffNHyg3/G4vK+1Q58Dd5Sc4UsAsNj8lEd0+OBAgWOR5cGm5lp4lXOAQ Fh0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:cc:references:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=JqvywLpoA32Tsu3bU9iTxNc2SYugj6jiSRlu/g5vyt8=; b=SeKbkmHEQdz323quaZOTR3IUpDgVd4n4hs7Mpr1AqD5mu+gsFizzG68NvPDdVTGLSu qcpmO4TmkEKWtMK694GQQTiow4bn0JBRCRjAHsqsYfub8t9NG0R1pBq6Hj0/Gs4vugKk nXxxRESu3Wp7H9rcpfKApULCz4e2NeB5o1tFeXL3C0+6F7IP1RtAjCzdQCpC/H0Lyda3 4JU/nNGcSw86UP7VgszCi4I9Yw7e90DWsjSafdv487nM4Mt3UhNjvo0oyszmhow/Qk3R G5eJio83sZtSs6dZ4sZnRfTCgOfdLCx0XTJPv9GInsuSpn2wxbiibk+6oJDEQap1fHf2 0mWA== X-Gm-Message-State: ABuFfogF79EGYDx57RQ8m3RhYZzhwEcEBM+ZLzL0iBAByZibY9+Isntn f8F3wrR8Vpo3NELRETk+d+hp1Q== X-Google-Smtp-Source: ACcGV618gM9P9fI6quwVJcKm0yzUizM9ZqipurRROR14DIbx6VOP0cmNG5/WJYrzEKx7OGOFqyQrPA== X-Received: by 2002:a2e:9047:: with SMTP id n7-v6mr18007252ljg.10.1539881335640; Thu, 18 Oct 2018 09:48:55 -0700 (PDT) Received: from wasted.cogentembedded.com ([31.173.83.17]) by smtp.gmail.com with ESMTPSA id y80-v6sm4626713lfd.78.2018.10.18.09.48.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Oct 2018 09:48:54 -0700 (PDT) From: Sergei Shtylyov Subject: [PATCH] arm64: dts: renesas: condor: switch from EtherAVB to GEther To: Simon Horman , Rob Herring , linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org Cc: Magnus Damm , Mark Rutland , Valentine Barshak References: Organization: Cogent Embedded Message-ID: <4f9e79ca-5d61-8dd4-fe79-42e8f7562f90@cogentembedded.com> Date: Thu, 18 Oct 2018 19:48:53 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-MW Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The "official" Condor boards have always been wired to mount NFS via GEther, not EtherAVB -- the boards resoldered for EtherAVB were local to Cogent Embedded, so we've been having an unpleasant situation where a "normal" Condor board still can't mount NFS (unless an EtherAVB PHY extension board is plugged in). Switch from EtherAVB to GEther at last! Fixes: 8091788f3d38 ("arm64: dts: renesas: condor: add EtherAVB support") Signed-off-by: Sergei Shtylyov --- The patch is against Linus' 'linux.git' repo -- coulan't find a fitting brancxh in Simon Horman's 'renesas.git' repo... arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 47 ++++++++++++------------ 1 file changed, 24 insertions(+), 23 deletions(-) Index: linux/arch/arm64/boot/dts/renesas/r8a77980-condor.dts =================================================================== --- linux.orig/arch/arm64/boot/dts/renesas/r8a77980-condor.dts +++ linux/arch/arm64/boot/dts/renesas/r8a77980-condor.dts @@ -15,7 +15,7 @@ aliases { serial0 = &scif0; - ethernet0 = &avb; + ethernet0 = &gether; }; chosen { @@ -47,23 +47,6 @@ }; }; -&avb { - pinctrl-0 = <&avb_pins>; - pinctrl-names = "default"; - - phy-mode = "rgmii-id"; - phy-handle = <&phy0>; - renesas,no-ether-link; - status = "okay"; - - phy0: ethernet-phy@0 { - rxc-skew-ps = <1500>; - reg = <0>; - interrupt-parent = <&gpio1>; - interrupts = <17 IRQ_TYPE_LEVEL_LOW>; - }; -}; - &canfd { pinctrl-0 = <&canfd0_pins>; pinctrl-names = "default"; @@ -82,6 +65,23 @@ clock-frequency = <32768>; }; +&gether { + pinctrl-0 = <&gether_pins>; + pinctrl-names = "default"; + + phy-mode = "rgmii-id"; + phy-handle = <&phy0>; + renesas,no-ether-link; + status = "okay"; + + phy0: ethernet-phy@0 { + rxc-skew-ps = <1500>; + reg = <0>; + interrupt-parent = <&gpio4>; + interrupts = <23 IRQ_TYPE_LEVEL_LOW>; + }; +}; + &i2c0 { pinctrl-0 = <&i2c0_pins>; pinctrl-names = "default"; @@ -118,16 +118,17 @@ }; &pfc { - avb_pins: avb { - groups = "avb_mdio", "avb_rgmii"; - function = "avb"; - }; - canfd0_pins: canfd0 { groups = "canfd0_data_a"; function = "canfd0"; }; + gether_pins: gether { + groups = "gether_mdio_a", "gether_rgmii", + "gether_txcrefclk", "gether_txcrefclk_mega"; + function = "gether"; + }; + i2c0_pins: i2c0 { groups = "i2c0"; function = "i2c0";