From patchwork Fri Oct 10 01:32:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iyappan Subramanian X-Patchwork-Id: 5063181 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 E847EC11AC for ; Fri, 10 Oct 2014 01:35:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 129EF2020E for ; Fri, 10 Oct 2014 01:35:13 +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 366FC20204 for ; Fri, 10 Oct 2014 01:35:12 +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 1XcP4a-00052T-DN; Fri, 10 Oct 2014 01:32:48 +0000 Received: from exprod5og121.obsmtp.com ([64.18.0.139]) by bombadil.infradead.org with smtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XcP47-0004sA-UJ for linux-arm-kernel@lists.infradead.org; Fri, 10 Oct 2014 01:32:20 +0000 Received: from mail-pd0-f179.google.com ([209.85.192.179]) (using TLSv1) by exprod5ob121.postini.com ([64.18.4.12]) with SMTP ID DSNKVDc3E/fIK82BbEkqOFdodda4KUId4th7@postini.com; Thu, 09 Oct 2014 18:32:19 PDT Received: by mail-pd0-f179.google.com with SMTP id r10so696805pdi.38 for ; Thu, 09 Oct 2014 18:32:02 -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=9Phg5q+iclTD/AohI6tMzvn+b8XTNE59CWOyBhG6BAI=; b=HF2ASrYybHUbXUwhZlWiZM+hfUDLkmwA2TMMEby0Q1EyxOUQWv98HcAFK9TvS/TiWl ZsckNQAGnp2+H34OXHxm6tdLXIs7/DcskDSPBH+YBGwnPkoskZat2DeTv0Gso059q/yu xXfJRfnR6kxSxbfKmcR4w+acFvfIIsZJriyG91ainz3b/9L3NkTVw3ro8aI9Vd3XG127 T9St++j0IOoyNdTqFHaIgvw2G4QXwVSWq+mFgxlVhqt9QNhyNv7ognjM0IfYATU8r+12 +UwG6yVRPKNG9oQDuU4+c03SPB4HVrDvpmofliWErH9kuRo2YaWdblJyZnSsRSC6aelv 7Kaw== X-Gm-Message-State: ALoCoQkjizCnhVDC90SnHD67vlfewAJ3kWO/7EMe4RTkp0PrICkGHVFvtPoGe8ggyxkHTXT1X3/XzxTNVwnnR9uNIWxsXbVR1/egtn6ZzNtYQhgoyUJBf1UjH6tehoQTfk8zEmzlaL9lzKYTOW19IqJmUbpdteeIDSvFRE/5W1lrPZX0s3FhKFs= X-Received: by 10.66.158.165 with SMTP id wv5mr1808454pab.36.1412904722852; Thu, 09 Oct 2014 18:32:02 -0700 (PDT) X-Received: by 10.66.158.165 with SMTP id wv5mr1808448pab.36.1412904722795; Thu, 09 Oct 2014 18:32:02 -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 a1sm1686537pdc.68.2014.10.09.18.32.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Oct 2014 18:32:01 -0700 (PDT) From: Iyappan Subramanian To: davem@davemloft.net, netdev@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v4 3/6] dtb: Add 10GbE node to APM X-Gene SoC device tree Date: Thu, 9 Oct 2014 18:32:04 -0700 Message-Id: <1412904727-23485-4-git-send-email-isubramanian@apm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1412904727-23485-1-git-send-email-isubramanian@apm.com> References: <1412904727-23485-1-git-send-email-isubramanian@apm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141009_183220_043955_8303BC0E X-CRM114-Status: GOOD ( 11.07 ) 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 | 29 +++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) 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 f391972..d16cc03 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>; @@ -420,7 +430,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 { @@ -435,12 +446,26 @@ }; }; + 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"; + }; + rng: rng@10520000 { compatible = "apm,xgene-rng"; reg = <0x0 0x10520000 0x0 0x100>; interrupts = <0x0 0x41 0x4>; clocks = <&rngpkaclk 0>; }; - }; };