From patchwork Tue Mar 25 23:34:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dinh Nguyen X-Patchwork-Id: 3891341 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C04BE9F2B6 for ; Tue, 25 Mar 2014 23:38:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D9D40201BC for ; Tue, 25 Mar 2014 23:38:30 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (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 C35062014A for ; Tue, 25 Mar 2014 23:38:29 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WSauo-00054m-34; Tue, 25 Mar 2014 23:37:54 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WSauc-0006Re-VM; Tue, 25 Mar 2014 23:37:42 +0000 Received: from mail-bl2on0112.outbound.protection.outlook.com ([65.55.169.112] helo=na01-bl2-obe.outbound.protection.outlook.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WSauH-0006Od-9g for linux-arm-kernel@lists.infradead.org; Tue, 25 Mar 2014 23:37:23 +0000 Received: from BL2FFO11FD046.protection.gbl (10.173.160.33) by BL2FFO11HUB010.protection.gbl (10.173.161.112) with Microsoft SMTP Server (TLS) id 15.0.908.10; Tue, 25 Mar 2014 23:36:59 +0000 Received: from SJ-ITEXEDGE02.altera.priv.altera.com (66.35.236.232) by BL2FFO11FD046.mail.protection.outlook.com (10.173.161.208) with Microsoft SMTP Server (TLS) id 15.0.908.10 via Frontend Transport; Tue, 25 Mar 2014 23:36:58 +0000 Received: from sj-mail01.altera.com (137.57.1.6) by SJ-ITEXEDGE02.altera.priv.altera.com (66.35.236.232) with Microsoft SMTP Server id 8.3.342.0; Tue, 25 Mar 2014 16:23:56 -0700 Received: from linux-builds1.altera.com (linux-builds1.altera.com [137.57.188.114]) by sj-mail01.altera.com (8.13.7+Sun/8.13.7) with ESMTP id s2PNargC018949; Tue, 25 Mar 2014 16:36:56 -0700 (PDT) From: To: , , , Subject: [PATCH 2/3] dts: socfpga: Fix ethernet entries for the stmmac Date: Tue, 25 Mar 2014 18:34:41 -0500 Message-ID: <1395790482-3957-3-git-send-email-dinguyen@altera.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1395790482-3957-1-git-send-email-dinguyen@altera.com> References: <1395790482-3957-1-git-send-email-dinguyen@altera.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: =?us-ascii?Q?CIP:66.35.236.232; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(1001?= =?us-ascii?Q?9001)(6009001)(458001)(199002)(189002)(56816005)(63696002)(4?= =?us-ascii?Q?7776003)(90146001)(87936001)(79102001)(20776003)(84676001)(3?= =?us-ascii?Q?6756003)(85306002)(89996001)(31966008)(74502001)(74662001)(4?= =?us-ascii?Q?7446002)(76482001)(87266001)(77156001)(56776001)(54316002)(8?= =?us-ascii?Q?7286001)(77982001)(77096001)(59766001)(53806001)(95416001)(5?= =?us-ascii?Q?0466002)(94946001)(80976001)(46102001)(97736001)(19580395003?= =?us-ascii?Q?)(88136002)(74706001)(76796001)(69226001)(50226001)(97186001?= =?us-ascii?Q?)(6806004)(80022001)(65816001)(62966002)(97336001)(44976005)?= =?us-ascii?Q?(74876001)(95666003)(83322001)(19580405001)(33646001)(518560?= =?us-ascii?Q?01)(93136001)(81816001)(81342001)(83072002)(74366001)(863620?= =?us-ascii?Q?01)(4396001)(93516002)(81686001)(85852003)(76786001)(8615200?= =?us-ascii?Q?2)(98676001)(2201001)(92726001)(92566001)(47736001)(81542001?= =?us-ascii?Q?)(50986001)(49866001)(47976001)(53416003)(48376002)(93916002?= =?us-ascii?Q?)(94316002); DIR:OUT; SFP:1102; SCL:1; SRVR:BL2FFO11HUB010; H:SJ-?= =?us-ascii?Q?ITEXEDGE02.altera.priv.altera.com; FPR:BCFF760E.FCDAAE26.3471?= =?us-ascii?Q?43F4.D663223.20253; MLV:sfv; PTR:InfoDomainNonexistent; A:1; MX:?= =?us-ascii?Q?1;LANG:en;?= X-OriginatorOrg: altera.onmicrosoft.com X-Forefront-PRVS: 01613DFDC8 Received-SPF: SoftFail (: domain of transitioning altera.com discourages use of 66.35.236.232 as permitted sender) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140325_193721_437013_4DDFDEE6 X-CRM114-Status: UNSURE ( 8.51 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, pawel.moll@arm.com, srinivas.kandagatla@st.com, netdev@vger.kernel.org, ijc+devicetree@hellion.org.uk, robh+dt@kernel.org, arm@kernel.org, Dinh Nguyen , galak@codeaurora.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_MED, 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 From: Dinh Nguyen * Replaced the parent/child DT nodes with a combined node * Renamed the device node from 'ethernet0' to 'ethernet' as the standard name. Signed-off-by: Arnd Bergmann Signed-off-by: Dinh Nguyen --- arch/arm/boot/dts/socfpga.dtsi | 51 +++++++++---------------- arch/arm/boot/dts/socfpga_arria5_socdk.dts | 5 +-- arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 5 +-- arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 5 +-- arch/arm/boot/dts/socfpga_vt.dts | 5 +-- 5 files changed, 22 insertions(+), 49 deletions(-) diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi index 404553c..953801c 100644 --- a/arch/arm/boot/dts/socfpga.dtsi +++ b/arch/arm/boot/dts/socfpga.dtsi @@ -450,43 +450,28 @@ }; }; - ethernet0: ethernet0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "altr,socfpga-stmmac"; - altr,sysmgr-syscon = <&sysmgr 0x60>; + gmac0: ethernet@ff700000 { + compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a", "snps,dwmac"; status = "disabled"; - ranges; - - gmac0: gmac0@ff700000 { - compatible = "snps,dwmac-3.70a", "snps,dwmac"; - reg = <0xff700000 0x2000>; - interrupts = <0 115 4>; - interrupt-names = "macirq"; - mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */ - clocks = <&emac0_clk>; - clock-names = "stmmaceth"; - }; + altr,sysmgr-syscon = <&sysmgr 0x60>; + reg = <0xff700000 0x2000>; + interrupts = <0 115 4>; + interrupt-names = "macirq"; + mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */ + clocks = <&emac0_clk>; + clock-names = "stmmaceth"; }; - ethernet1: ethernet1 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "altr,socfpga-stmmac"; - altr,sysmgr-syscon = <&sysmgr 0x60>; + gmac1: ethernet@ff702000 { + compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a", "snps,dwmac"; status = "disabled"; - ranges; - - gmac1: gmac1@ff702000 { - device_type = "network"; - compatible = "snps,dwmac-3.70a", "snps,dwmac"; - reg = <0xff702000 0x2000>; - interrupts = <0 120 4>; - interrupt-names = "macirq"; - mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */ - clocks = <&emac1_clk>; - clock-names = "stmmaceth"; - }; + altr,sysmgr-syscon = <&sysmgr 0x60>; + reg = <0xff702000 0x2000>; + interrupts = <0 120 4>; + interrupt-names = "macirq"; + mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */ + clocks = <&emac1_clk>; + clock-names = "stmmaceth"; }; L2: l2-cache@fffef000 { diff --git a/arch/arm/boot/dts/socfpga_arria5_socdk.dts b/arch/arm/boot/dts/socfpga_arria5_socdk.dts index 2d6b38b..a87ee1c 100644 --- a/arch/arm/boot/dts/socfpga_arria5_socdk.dts +++ b/arch/arm/boot/dts/socfpga_arria5_socdk.dts @@ -46,11 +46,8 @@ }; }; -ðernet1 { - status = "okay"; -}; - &gmac1 { + status = "okay"; phy-mode = "rgmii"; rxd0-skew-ps = <0>; diff --git a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts b/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts index 26c63a0..ae16d97 100644 --- a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts +++ b/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts @@ -39,11 +39,8 @@ }; }; -ðernet1 { - status = "okay"; -}; - &gmac1 { + status = "okay"; phy-mode = "rgmii"; rxd0-skew-ps = <0>; diff --git a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts index 469bb5c..b79e2a2 100644 --- a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts +++ b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts @@ -39,11 +39,8 @@ }; }; -ðernet1 { - status = "okay"; -}; - &gmac1 { + status = "okay"; phy-mode = "rgmii"; rxd0-skew-ps = <0>; diff --git a/arch/arm/boot/dts/socfpga_vt.dts b/arch/arm/boot/dts/socfpga_vt.dts index 91f6ccf..87d6f75 100644 --- a/arch/arm/boot/dts/socfpga_vt.dts +++ b/arch/arm/boot/dts/socfpga_vt.dts @@ -87,10 +87,7 @@ }; }; -ðernet0 { - status = "okay"; -}; - &gmac0 { + status = "okay"; phy-mode = "gmii"; };