From patchwork Thu Jul 7 00:35:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iyappan Subramanian X-Patchwork-Id: 9217481 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 96192607D9 for ; Thu, 7 Jul 2016 00:38:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8767C28590 for ; Thu, 7 Jul 2016 00:38:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7C0B42858D; Thu, 7 Jul 2016 00:38: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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5DE502858D for ; Thu, 7 Jul 2016 00:38:56 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bKxJr-0001kO-8c; Thu, 07 Jul 2016 00:37:31 +0000 Received: from mail-pf0-x233.google.com ([2607:f8b0:400e:c00::233]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bKxIF-0008G1-3W for linux-arm-kernel@lists.infradead.org; Thu, 07 Jul 2016 00:35:52 +0000 Received: by mail-pf0-x233.google.com with SMTP id i123so905218pfg.0 for ; Wed, 06 Jul 2016 17:35:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apm.com; s=apm; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qx8+iC9jJ8ncXeHHQD+GAsgUfxdwipQaXyUmx6NlCnc=; b=Lcnyi/38jy8QAGWuYprexysSgcza7N9ZxIGGo3+d+Uq/HeImP+dHBup5ZJsBq4O9bJ qL9nV+YqjPbA6AG5rxMw2Vw6l7B4CXUJOUCeWkSEi5dlv+FylUstdB7nX+CMZzvjX9+e PaEcEDydtnLCao0EmqxMfTJk++3zhIbFT2tlw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qx8+iC9jJ8ncXeHHQD+GAsgUfxdwipQaXyUmx6NlCnc=; b=WRb93RuhOglGcmIakd57j3yVn19nM6iRNHFBaPx1we53I/SWs0Q22wCLrbKEr5At6A gMmkQ5sAaGXuaNgeXyRMlCCy37NbGhF6KlFasiEW4Ox1u5UMd7WvRPRshbDe9SFpBFjN eJkPhWcyBuXmukO5iM6DuCquk0KRFttoA9I7PL6O+B4o74tpQDY590ru6pTykpX8z+o8 nwoll2avKF32YYib46E1ukjSL/OYKsNagNviiYogRHyrDvFCuYkqpPReOItAq0joaWof cc56bsflbc0eEeHo9gqXUIKN8M7DL0+W2hbK+FdoLi+iD3rez6vzpfXkNapXSYe7QBPJ h3nw== X-Gm-Message-State: ALyK8tLpD39J3PURugKcT7h2yeVBJIcLPTVvvC7cl4Mk5yHXNsgpUGWJI46e0ibGjsqS/eYS X-Received: by 10.98.205.79 with SMTP id o76mr293247pfg.37.1467851730546; Wed, 06 Jul 2016 17:35:30 -0700 (PDT) Received: from isubrama-dev.amcc.com ([206.80.4.98]) by smtp.gmail.com with ESMTPSA id p63sm6769956pfp.65.2016.07.06.17.35.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Jul 2016 17:35:29 -0700 (PDT) From: Iyappan Subramanian To: davem@davemloft.net, netdev@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v4 09/11] dtb: xgene: Add MDIO node Date: Wed, 6 Jul 2016 17:35:10 -0700 Message-Id: <1467851712-24780-10-git-send-email-isubramanian@apm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467851712-24780-1-git-send-email-isubramanian@apm.com> References: <1467851712-24780-1-git-send-email-isubramanian@apm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160706_173551_342886_0B9DDA15 X-CRM114-Status: GOOD ( 10.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: matthias.bgg@gmail.com, andrew@lunn.ch, patches@apm.com, linux-arm-kernel@lists.infradead.org, Iyappan Subramanian MIME-Version: 1.0 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 Added mdio node for mdio driver. Also added phy-handle reference to the ethernet nodes. Removed unused mdio subnode within storm menet ethernet node. Removed unused clock node from storm sgenet1. Signed-off-by: Iyappan Subramanian Tested-by: Fushen Chen Tested-by: Toan Le Tested-by: Matthias Brugger --- arch/arm64/boot/dts/apm/apm-mustang.dts | 12 +++++++++++ arch/arm64/boot/dts/apm/apm-storm.dtsi | 36 ++++++++++++--------------------- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/arch/arm64/boot/dts/apm/apm-mustang.dts b/arch/arm64/boot/dts/apm/apm-mustang.dts index 44db32e..b7fb5d9 100644 --- a/arch/arm64/boot/dts/apm/apm-mustang.dts +++ b/arch/arm64/boot/dts/apm/apm-mustang.dts @@ -79,3 +79,15 @@ &mmc0 { status = "ok"; }; + +&mdio { + menet0phy: phy@3 { + reg = <0x3>; + }; + sgenet0phy: phy@4 { + reg = <0x4>; + }; + sgenet1phy: phy@5 { + reg = <0x5>; + }; +}; diff --git a/arch/arm64/boot/dts/apm/apm-storm.dtsi b/arch/arm64/boot/dts/apm/apm-storm.dtsi index 5147d76..a415b3a 100644 --- a/arch/arm64/boot/dts/apm/apm-storm.dtsi +++ b/arch/arm64/boot/dts/apm/apm-storm.dtsi @@ -237,20 +237,11 @@ clocks = <&socplldiv2 0>; reg = <0x0 0x1f21c000 0x0 0x1000>; reg-names = "csr-reg"; - csr-mask = <0x3>; + csr-mask = <0xa>; + enable-mask = <0xf>; clock-output-names = "sge0clk"; }; - sge1clk: sge1clk@1f21c000 { - compatible = "apm,xgene-device-clock"; - #clock-cells = <1>; - clocks = <&socplldiv2 0>; - reg = <0x0 0x1f21c000 0x0 0x1000>; - reg-names = "csr-reg"; - csr-mask = <0xc>; - clock-output-names = "sge1clk"; - }; - xge0clk: xge0clk@1f61c000 { compatible = "apm,xgene-device-clock"; #clock-cells = <1>; @@ -921,6 +912,14 @@ clocks = <&rtcclk 0>; }; + mdio: mdio@0x17020000 { + compatible = "apm,xgene-mdio-rgmii"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x0 0x17020000 0x0 0xd100>; + clocks = <&menetclk 0>; + }; + menet: ethernet@17020000 { compatible = "apm,xgene-enet"; status = "disabled"; @@ -934,17 +933,7 @@ /* mac address will be overwritten by the bootloader */ local-mac-address = [00 00 00 00 00 00]; phy-connection-type = "rgmii"; - phy-handle = <&menetphy>; - mdio { - compatible = "apm,xgene-mdio"; - #address-cells = <1>; - #size-cells = <0>; - menetphy: menetphy@3 { - compatible = "ethernet-phy-id001c.c915"; - reg = <0x3>; - }; - - }; + phy-handle = <&menet0phy>; }; sgenet0: ethernet@1f210000 { @@ -960,6 +949,7 @@ clocks = <&sge0clk 0>; local-mac-address = [00 00 00 00 00 00]; phy-connection-type = "sgmii"; + phy-handle = <&sgenet0phy>; }; sgenet1: ethernet@1f210030 { @@ -973,9 +963,9 @@ <0x0 0xAD 0x4>; port-id = <1>; dma-coherent; - clocks = <&sge1clk 0>; local-mac-address = [00 00 00 00 00 00]; phy-connection-type = "sgmii"; + phy-handle = <&sgenet1phy>; }; xgenet: ethernet@1f610000 {