From patchwork Thu Oct 9 03:54:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iyappan Subramanian X-Patchwork-Id: 5056271 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4C973C11AB for ; Thu, 9 Oct 2014 03:57:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 818A120155 for ; Thu, 9 Oct 2014 03:57:28 +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 B485D20117 for ; Thu, 9 Oct 2014 03:57:27 +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 1Xc4ou-0007gf-RL; Thu, 09 Oct 2014 03:55:16 +0000 Received: from exprod5og115.obsmtp.com ([64.18.0.246]) by bombadil.infradead.org with smtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xc4oH-0006Ff-Cn for linux-arm-kernel@lists.infradead.org; Thu, 09 Oct 2014 03:54:38 +0000 Received: from mail-ig0-f176.google.com ([209.85.213.176]) (using TLSv1) by exprod5ob115.postini.com ([64.18.4.12]) with SMTP ID DSNKVDYG6AkBuGEtKn/PNgLwkfc6fRnLiWVr@postini.com; Wed, 08 Oct 2014 20:54:37 PDT Received: by mail-ig0-f176.google.com with SMTP id hn15so10412646igb.3 for ; Wed, 08 Oct 2014 20:54:15 -0700 (PDT) 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=cigyHmA1N53WhJqdKIxSLNpYT99Wz2GUL6FKWzWkncI=; b=Yegmx4m6zjsCcKBSH1lcM/of69iD2a8KQTr1HbJpQesYpyV7pgu3RrKKfZ3lG/BVMK HmoZaGyrBncmqVRWHeed1G2Hd7bDiM+VagWErWsxw2eqEgB/wI6SIoXanHRvs1tDhszo VAlhfofqFhrXQVV7xwkJHDCdqKYXXdiG4ufY3YJHzsw2KY5cEZ0gIjHwlAG3p/eC+6y8 Wcv2OGdAvLPHHRkXPBPPfYYqLkP1y45A6TZHlOWenT7IRTKS6XaTrJDErTSWSZylAgMh WgJiKHE3BlCJ6u4J+Uo+/ABDBcF0Te2OTfj55uLP2dpUfJuwOZSXbS30eOy9ZCzQDHlQ EPJg== X-Gm-Message-State: ALoCoQllaG6UhNlsHK8AyJWzJ/Mae5Ev/Ogum8VuMrZ2IWK1AF28c5MsTHIJtlzaAcATyDoMkZsrO7lyXC71KTrRzwthHLvppq52wduHICj0PW0VQOGGjcToz4l3JYxruGSVxOmhWMfVMnu36nVJWbPTffywW+J35JF+aUhl3cDchNQqE5gENuU= X-Received: by 10.50.109.228 with SMTP id hv4mr51059935igb.13.1412826855858; Wed, 08 Oct 2014 20:54:15 -0700 (PDT) X-Received: by 10.50.109.228 with SMTP id hv4mr51059899igb.13.1412826855725; Wed, 08 Oct 2014 20:54:15 -0700 (PDT) Received: from svdclab-13-11.amcc.com (67-207-112-226.static.wiline.com. [67.207.112.226]) by mx.google.com with ESMTPSA id p5sm4325958iga.5.2014.10.08.20.54.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Oct 2014 20:54:14 -0700 (PDT) From: Iyappan Subramanian To: davem@davemloft.net, netdev@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v3 3/6] dtb: Add 10GbE node to APM X-Gene SoC device tree Date: Wed, 8 Oct 2014 20:54:18 -0700 Message-Id: <1412826861-32208-4-git-send-email-isubramanian@apm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1412826861-32208-1-git-send-email-isubramanian@apm.com> References: <1412826861-32208-1-git-send-email-isubramanian@apm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141008_205437_510200_0CE9F2A5 X-CRM114-Status: GOOD ( 10.46 ) X-Spam-Score: -2.3 (--) Cc: kchudgar@apm.com, patches@apm.com, linux-arm-kernel@lists.infradead.org, Iyappan Subramanian 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=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, 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 Added 10GbE interface and clock nodes. Signed-off-by: Iyappan Subramanian Signed-off-by: Keyur Chudgar --- arch/arm64/boot/dts/apm-mustang.dts | 4 ++++ arch/arm64/boot/dts/apm-storm.dtsi | 28 +++++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/apm-mustang.dts b/arch/arm64/boot/dts/apm-mustang.dts index b2f5622..2ae782b 100644 --- a/arch/arm64/boot/dts/apm-mustang.dts +++ b/arch/arm64/boot/dts/apm-mustang.dts @@ -32,3 +32,7 @@ &menet { status = "ok"; }; + +&xgenet { + status = "ok"; +}; diff --git a/arch/arm64/boot/dts/apm-storm.dtsi b/arch/arm64/boot/dts/apm-storm.dtsi index c0aceef..0a4dbf8 100644 --- a/arch/arm64/boot/dts/apm-storm.dtsi +++ b/arch/arm64/boot/dts/apm-storm.dtsi @@ -176,6 +176,16 @@ clock-output-names = "menetclk"; }; + xge0clk: xge0clk@1f61c000 { + compatible = "apm,xgene-device-clock"; + #clock-cells = <1>; + clocks = <&socplldiv2 0>; + reg = <0x0 0x1f61c000 0x0 0x1000>; + reg-names = "csr-reg"; + csr-mask = <0x3>; + clock-output-names = "xge0clk"; + }; + sataphy1clk: sataphy1clk@1f21c000 { compatible = "apm,xgene-device-clock"; #clock-cells = <1>; @@ -407,7 +417,8 @@ interrupts = <0x0 0x3c 0x4>; dma-coherent; clocks = <&menetclk 0>; - local-mac-address = [00 01 73 00 00 01]; + /* 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 { @@ -421,5 +432,20 @@ }; }; + + xgenet: ethernet@1f610000 { + compatible = "apm,xgene-enet"; + status = "disabled"; + reg = <0x0 0x1f610000 0x0 0xd100>, + <0x0 0x1f600000 0x0 0X400>, + <0x0 0x18000000 0x0 0X200>; + reg-names = "enet_csr", "ring_csr", "ring_cmd"; + interrupts = <0x0 0x60 0x4>; + dma-coherent; + clocks = <&xge0clk 0>; + /* mac address will be overwritten by the bootloader */ + local-mac-address = [00 00 00 00 00 00]; + phy-connection-type = "xgmii"; + }; }; };