From patchwork Sun Feb 19 21:41:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 9581855 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 072276045A for ; Sun, 19 Feb 2017 21:44:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC49D287BB for ; Sun, 19 Feb 2017 21:44:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E0FF6287C8; Sun, 19 Feb 2017 21:44:38 +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=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 79A5E287BB for ; Sun, 19 Feb 2017 21:44:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=GZYK8d/aXmYOLtHt4hror4s5msb0dzHqU8nKtX9GYvg=; b=QXCmJKUofii5aDO20wKwSdAzkN EBitv0wjVsc9QcX7hNNrBWWHiD0v5uqbFg9gP7jdlVNFwAw9a3ZUEi6dH0NSg19O//VGqAaXBut0O 0c5M3n8RqIfMvBDa3DO0e4xkTgHDJbSHE00nDijdUJwCN0qHkWWfJ2t2vs+GLjZKTf2Apg03HRAXi GCJecRNLroBiqt+POadVTt2JkX8QyYvsQUJLciPnINTSJgacz6ITIjTYCMlsPa6+xSDmfVjcL20U2 uPGq4My0vPqbxdz97HrkJnENTQKnkdWQcIcEnJ2zVpN/xp15zAT51PIvjQ4BhFVYNZCS462i0RG+8 4QMhO6aA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cfZHT-00060b-EB; Sun, 19 Feb 2017 21:44:31 +0000 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cfZFp-0004wY-KJ; Sun, 19 Feb 2017 21:42:54 +0000 Received: by mail-wm0-x241.google.com with SMTP id c85so11372703wmi.1; Sun, 19 Feb 2017 13:42:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=M8qrYkY+rUNQ5o9/lPIU7rYwjzmMJjlnCYf3h+N4Hjo=; b=QtUkk3zUTHhsEwTXTd2sgrIFJxQUYmdZBGiIEklNLq/EBfJ3ebqAQ9KzZu/MTiIj0J XmjOmv7slxVh+V2AgglmGhNqE5Iv+PLB2ttH7kVjRzsDOfw/UYimgzxzCecs1MrIbnT5 mnRGvLHxykBwswCXfkiEZ0Lx6nFtqqLkgh4u4SrHWvMe6BKltcvm2E+yGlDbjKFBRVhn 5ERJT9SsFuEmdaLMnr31wje/TGjeBbDifB4m4QdYcREGStieNxNtF734E8WvSMyI0iVf XVA8vwO/X1vWbP3oRr839O+Xrex1OTxSfOR796D1obdTy25npRekcVm4it07nAroBSJT HLIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=M8qrYkY+rUNQ5o9/lPIU7rYwjzmMJjlnCYf3h+N4Hjo=; b=NkT2yK5OSn5Q1Fc9ErEaJtr1DuMp0wsYh0YTU/Xe2px2XSgvWgDwEZvQ9DNx1dYPo8 B3bpJJexPT+4KlOXtMkJcy3AUMECmVfUj6w4lgBIMjfbs5L7hBO1VQeMEPAvGSFtcxuJ 5416+QVhaQUvIKp/qmZUgmCAo7S+zONf5ftJ0yhldcELEHx8crv8GfeAR0eqwQG8N1Gl vuJYMY0JtMgfYZMIw4XM4DK/XecBObydhDpFAzW3zd3dtTgpjRfk0tqBcsQgsYW7SQtg un268wYZgMxxmnP/W+4RT5FOmopc/6sU6z0FgIgDGmIYMDPO/qq74yjYJrS+sRAZBstG TyjQ== X-Gm-Message-State: AMke39m41bWnKOPAnSERAA18Fjc0RZLzTZ3UwlfBlBPi3Ys19MhFkD/Mu21Apxgg2dpiXw== X-Received: by 10.28.71.220 with SMTP id m89mr14184667wmi.120.1487540548584; Sun, 19 Feb 2017 13:42:28 -0800 (PST) Received: from blackbox.darklights.net (p200300DCD3D1DA04B05FF2CCBB42C4A7.dip0.t-ipconnect.de. [2003:dc:d3d1:da04:b05f:f2cc:bb42:c4a7]) by smtp.googlemail.com with ESMTPSA id c9sm10879700wmf.18.2017.02.19.13.42.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 19 Feb 2017 13:42:27 -0800 (PST) From: Martin Blumenstingl To: khilman@baylibre.com, linux-amlogic@lists.infradead.org, carlo@caione.org Subject: [PATCH v5 7/9] ARM64: dts: meson-gxbb-p201: fix ethernet support Date: Sun, 19 Feb 2017 22:41:47 +0100 Message-Id: <20170219214149.30418-8-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170219214149.30418-1-martin.blumenstingl@googlemail.com> References: <20170122181028.5014-1-martin.blumenstingl@googlemail.com> <20170219214149.30418-1-martin.blumenstingl@googlemail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170219_134250_037537_0C02462A X-CRM114-Status: GOOD ( 10.94 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, narmstrong@baylibre.com, Martin Blumenstingl , catalin.marinas@arm.com, will.deacon@arm.com, robh+dt@kernel.org, andrew@lunn.ch, linux-arm-kernel@lists.infradead.org, jbrunet@baylibre.com MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Amlogic's own .dts specifies that the P201 board uses a RMII PHY (with the reset GPIO being GPIOZ_14). However our P201 board .dts simply inherits the phy-mode setting from from meson-gx.dtsi where it defaults to RGMII mode. Remove all ethernet settings from meson-gxbb-p20x.dtsi as it only specifies the RGMII pins which are only valid for the P200 board. Instead we add the ethmac node to the meson-gxbb-p201.dts and configure the pinctrl property and the phy-mode for an RMII PHY. An MDIO node (which would also specify the PHY) is not added since we don't know which PHY is being used (and thus which PHY address would have to be used). Signed-off-by: Martin Blumenstingl Acked-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts | 11 +++++++++++ arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 6 ------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts index 39bb037a3e47..ae3194663d64 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts @@ -50,3 +50,14 @@ compatible = "amlogic,p201", "amlogic,meson-gxbb"; model = "Amlogic Meson GXBB P201 Development Board"; }; + +ðmac { + status = "okay"; + pinctrl-0 = <ð_rmii_pins>; + pinctrl-names = "default"; + phy-mode = "rmii"; + + snps,reset-gpio = <&gpio GPIOZ_14 0>; + snps,reset-delays-us = <0 10000 1000000>; + snps,reset-active-low; +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi index 4a96e0f6f926..17ebe46e48d4 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi @@ -144,12 +144,6 @@ pinctrl-names = "default"; }; -ðmac { - status = "okay"; - pinctrl-0 = <ð_rgmii_pins>; - pinctrl-names = "default"; -}; - &ir { status = "okay"; pinctrl-0 = <&remote_input_ao_pins>;