From patchwork Tue Jul 14 15:46:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Manoil X-Patchwork-Id: 6788041 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6D41B9F749 for ; Tue, 14 Jul 2015 15:51:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 50D382073F for ; Tue, 14 Jul 2015 15:51:31 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 2DABE2073D for ; Tue, 14 Jul 2015 15:51:30 +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 1ZF2Ru-00051L-0Q; Tue, 14 Jul 2015 15:48:50 +0000 Received: from mail-bn1on0148.outbound.protection.outlook.com ([157.56.110.148] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZF2Rq-0004zo-ME for linux-arm-kernel@lists.infradead.org; Tue, 14 Jul 2015 15:48:47 +0000 Received: from BN3PR0301CA0064.namprd03.prod.outlook.com (10.160.152.160) by CY1PR0301MB0876.namprd03.prod.outlook.com (10.160.164.19) with Microsoft SMTP Server (TLS) id 15.1.213.14; Tue, 14 Jul 2015 15:48:23 +0000 Received: from BL2FFO11FD030.protection.gbl (2a01:111:f400:7c09::151) by BN3PR0301CA0064.outlook.office365.com (2a01:111:e400:401e::32) with Microsoft SMTP Server (TLS) id 15.1.213.14 via Frontend Transport; Tue, 14 Jul 2015 15:48:23 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD030.mail.protection.outlook.com (10.173.161.40) with Microsoft SMTP Server (TLS) id 15.1.213.8 via Frontend Transport; Tue, 14 Jul 2015 15:48:23 +0000 Received: from fsr-fed1764-016.ea.freescale.net (fsr-fed1764-016.ea.freescale.net [10.171.81.161]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id t6EFmJq1025280; Tue, 14 Jul 2015 08:48:20 -0700 From: Claudiu Manoil To: , , , Subject: [PATCH v2] dts: ls1021a: Add dts nodes for eTSEC0, eTSEC1 and eTSEC2 Date: Tue, 14 Jul 2015 18:46:17 +0300 Message-ID: <1436888777-29742-1-git-send-email-claudiu.manoil@freescale.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <20150713133138.GO23464@tiger> References: <20150713133138.GO23464@tiger> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD030; 1:1ORyv/2X5c/oAm3wvKE0ak+a6XzJqYF8v0Fj1Gb835ti2lch9a3LWecIn0SaxMKlBvTw/xl3bZvu13wf9JR4neVkVcunKPJtYEOgxPyvAiruk9yYusDEBukjEEqrbJvWzCNIQ77qtytwXRG5crI4EcCT4fKnBZ5qhVLBiR7cxXuBlZTFTDHnbNVXar6dJK1kXpX5qLsKOKG7LQZmmr76bnMoj6zpQ0lBj7Wb5qm1QNMqb0ZApO5l4ySCvtLFMYohT7FoCzjHXX/aH/xH5CzoeuaX9Ki+pZ5IlGDEaKXga/OYEpwUgpJ/HcReNWAfgNQ40z/29PqMiSewmJLitGRgjEjfUSer40aWaRZNQv+3nVoD9CcBITdtJCwIHlIyjtnCHVbDFkTmYb+zjcNq5AbmDHcq4pYbxo1NNiu5wLYQszsIquiVnNouKxfKEZGRNpWd X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(339900001)(199003)(189002)(229853001)(33646002)(107886002)(5001960100002)(87936001)(77156002)(92566002)(62966003)(189998001)(104016003)(77096005)(36756003)(50466002)(76176999)(106466001)(2950100001)(48376002)(46102003)(50986999)(105606002)(5001770100001)(47776003)(85426001)(86362001)(6806004)(19580405001)(2201001)(5003940100001)(50226001)(19580395003)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR0301MB0876; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:sfv; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0876; 2:shOLurrJ6hYvG/kM0UE5OJmUpXrZMSp13AP4fD9rmv5J2NeTfVUrtnmWsqpsZMKY; 3:8CjU4jucHeAmEcdHd+cZ2NmPml2H5z1bctaux6PckoaJLVdUHfn2gUe7RvsYQcwYwtbgI8yJ3XdggeAteKZcvSzxwIUv8BkJLhdSKvw1vjEzMg94VM6Jx2Hn9gi3XsViNdIkmf4r7GeyfGCzqTWtoA+64btJw2fVGnTQcBpIA6K36ACofU52N/ExhJcZd1u/I/DDwwBGIJwsdR3i5wbsIi4nxcZDRBafGCSCWO4pkM8=; 25:RZMHqDbiJtJU+C33adQA6IAlgsFR42QEFDRedCq26zByrVS7VZ9EDIEEx6rVxlGQ+Mw5D2J+Csuv/xE5Y4vHCtGL8V4B+NCOT74qS77acvatMdk4/7gILThlOgyEF1fA+e1wzxjS1KPmymwKUKZdRI+PKxeHQB6/AYfCfTjoO3hxWex0cbx5gAmX2GcK2aD5srAg65Qbwkh6/mz+1sVpVfwY2y3qVT3xTDEtscPnZVQ=; 20:49gH3S60RJQkpKq6mg7MJVHUFocU8HYv3vnyzewQw9fE1S3MdZHb6j86O8XJXYa5JpxuqkqP42+G5xvC5Xzh0LCxaCuqu/gSVcFAtx89EgSXZjTBKXdT5iIqmC7zkvkqeNGD2M4SMpCNiBur6nk5kcSGdmEi/QZylpC/7wcFrBw5xgFLaBcxlXoPcMZrB2ehaI0U1FLF1UDkv1KEx0RxNZ7HW0xLw4zP/zBc+dPEObnORrXAHgQ8lEVKwPx9wbDR1Fp/FYeqTUm8qlOCwddvfl9MDYMaVT+fAPp9NR0puLP3q7AxAXFn3ZsMiyob1FsfKixYBb17y69m/1Ia6uCyg4HesoO37ZmeEmwgZHmhuZA= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB0876; CY1PR0301MB0876: X-MS-Exchange-Organization-RulesExecuted X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:CY1PR0301MB0876; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0301MB0876; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0876; 4:s/j+MWdMRawYZct1QBqToTrdmu2oQasXrbl/Hg6doYjO2f0n4/ieJREQbR5HIqcKUDK+wLWBsJ/gzQ6LErhvDRebmJjJpt5+akyWS1lRCta7QegJR1H4gDu2kc1DNsNq9OO6IjduFz6AxlkhJCowtAYR4I2ePvf1+H3zlPv5e4s0zunX6bp1i9Qr8dwRVadUwS1/MdcHqiyXcfDPE2MsnIN1zVh5aweEKZcrx2VZGokIsk9JiL3j2unUv5KoZn3oVLbFkV/x/4UTKySLDf3Q5/qJhLhTLw0M8N7am2mb6/I= X-Forefront-PRVS: 0637FCE711 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB0876; 23:quwVuAsgILPqX/P18liWDVm36sav+WuHxIS8gh6?= =?us-ascii?Q?EWP2AthKSUGRn9H4d1pHL1JMJAV9PwNHlKAaqV9ZfA/M8WxpccjrOlRpG1/x?= =?us-ascii?Q?443hFCItWTUqI8B4u2+bg/7rIIoSJDG3V92eFzITbMYRRNGDfQCmpGUtLMv5?= =?us-ascii?Q?+ymh4cD8jr10zXBI87mX9/Hcq2e48recWOCaJSqm4rjPkkzXx1ovS5zD5hFV?= =?us-ascii?Q?PhNbW/nZ04d74Fxizhnd2uYgLR6ytAx3WgzDxBF7550rqyzlo6ooFPEudj+8?= =?us-ascii?Q?ktRf/JCgwEjSMSZSsdqQJ9p5QEwMI3B3u8SY/2cMOkydKY6dourx12y66P6e?= =?us-ascii?Q?BgZ1AWdUnjk1zKmQQkxj+AAo0ZfaE1eWJ1v3oFZUVXnPArSBT5LnyDUVvuih?= =?us-ascii?Q?4VXUDYyfTTW20i+qUpVaKYMsIrMD4P5XOmsKwPKgbpBU3VZIu34PfbW6zgQV?= =?us-ascii?Q?G2vmSePCO5fCcEnZGF8E3dtsTh0SjvB1/pGJVV7mG7fJo7buIHbmiA/CIyng?= =?us-ascii?Q?TK+gyLh+Y8qa64QZw/0nWRW/laFCx+ZK8kWuf9Kv4wOKbdDnX3vqoNIZwLPg?= =?us-ascii?Q?TZCV8uDN+UWYLx/RL4Ofs62CuNPEZmtkasi8tNRDI02611yVm/lee+NOCHky?= =?us-ascii?Q?uRyAhy1lILeLTl4jBWf9PfFlStXAEMVyBdTaGR2IknHF8foWmMwxiKTHPNmB?= =?us-ascii?Q?5hsv5bwUGP3OK4z8YqhtWsIUGd0cIwXsPFIbihjXioJPsTuXgal1eFi/zUmB?= =?us-ascii?Q?K96rMGeu8Kw+JcvIdipxnnQ+oLOgge3ZOgKyxgX3+X3bihaaBZjt5TwR3GI3?= =?us-ascii?Q?7f8PuZcNB3sv1iaoG+cdF90vSZ75tvsSCa6elmVe4Ka1E5j8Qaag0P8V4rkM?= =?us-ascii?Q?NosEi0QNlJ9x5bcLn53moaiMWQ5VkMBHmPXSKbdrOSccm6p4GnJ2tXt76mhm?= =?us-ascii?Q?FFjOkiEMIKPKfe5UBFNqlZVZiDjczEwH4c4hwU4hvVw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0876; 5:yWcl3ehbsjvhyW9nAK34RUAnbfXFuNG9xpVCHlEnk3h5HiTgSHQwZ/kYKI6fdAbqXxnLt2Lo1TvRY+jwYg2h/G9CDGftIkFQ0ARxbS/y165Lv9pMjUusGDvy6HTQ10wVdjY4eM1ZVsbNdyagxrM8PQ==; 24:hzvLj2Q+Ojy+ThH8kQrG7GVX7IFgtiu9/iE/uyu11TTuQ2mxZoocfxiSyVawUtzo5x9Q9R5pGDLxuUdAbmAtxhlex8IYN90YuGD0HvUCUsY=; 20:XBj416004cgIZqxQL2NfwU+AGZ76WLc/4TiQsz62/Y0uypBUWP3c14nayFreazdL0shoqimsBoXuGHCnZpbsRg== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2015 15:48:23.2662 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB0876 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150714_084846_997976_FC80BB7F X-CRM114-Status: GOOD ( 18.06 ) X-Spam-Score: -1.9 (-) 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: Alison Wang Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.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 This patch adds generic dts nodes for eTSEC0, eTSEC1 and eTSEC2. Signed-off-by: Alison Wang Enable support for the second interrupt group register block and the corresponding Rx/Tx/Err interrupt sources, for each eTSEC node. DT binding documentation updates. Signed-off-by: Claudiu Manoil --- v2: - register block size is 0x1000 (4kB memory page), not 0x8000; - reg property has 2 "address" and resp. 2 "size" cells; - remove optional/ obsoleted properties; - use register block address as queue-group id for consistency; - binding documentation updates for missing vendor properties; .../devicetree/bindings/net/fsl-tsec-phy.txt | 6 +- arch/arm/boot/dts/ls1021a-qds.dts | 20 +++++ arch/arm/boot/dts/ls1021a-twr.dts | 20 +++++ arch/arm/boot/dts/ls1021a.dtsi | 92 ++++++++++++++++++++++ 4 files changed, 137 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/net/fsl-tsec-phy.txt b/Documentation/devicetree/bindings/net/fsl-tsec-phy.txt index 1e97532..b3291c7 100644 --- a/Documentation/devicetree/bindings/net/fsl-tsec-phy.txt +++ b/Documentation/devicetree/bindings/net/fsl-tsec-phy.txt @@ -45,7 +45,7 @@ Properties: - device_type : Should be "network" - model : Model of the device. Can be "TSEC", "eTSEC", or "FEC" - - compatible : Should be "gianfar" + - compatible : "gianfar", "fsl-etsec2" - reg : Offset and length of the register set for the device - interrupts : For FEC devices, the first interrupt is the device's interrupt. For TSEC and eTSEC devices, the first interrupt is @@ -57,6 +57,10 @@ Properties: "rgmii-id", as all other connection types are detected by hardware. - fsl,magic-packet : If present, indicates that the hardware supports waking up via magic packet. + - fsl,wake-on-filer: Indicates that the device can wake up the system + by generating a filer interrupt. Depending on the wake-on-lan mode + set for this device, the filer interrupt can be triggered by certain + user-defined ethernet packets (usually ARP or L2 unicast packets). - bd-stash : If present, indicates that the hardware supports stashing buffer descriptors in the L2. - rx-stash-len : Denotes the number of bytes of a received buffer to stash diff --git a/arch/arm/boot/dts/ls1021a-qds.dts b/arch/arm/boot/dts/ls1021a-qds.dts index 9c5e16b..f16a061 100644 --- a/arch/arm/boot/dts/ls1021a-qds.dts +++ b/arch/arm/boot/dts/ls1021a-qds.dts @@ -75,6 +75,26 @@ }; }; +&enet0 { + tbi-handle = <&tbi0>; + phy-handle = <&sgmii_phy1c>; + phy-connection-type = "sgmii"; + status = "okay"; +}; + +&enet1 { + tbi-handle = <&tbi0>; + phy-handle = <&sgmii_phy1d>; + phy-connection-type = "sgmii"; + status = "okay"; +}; + +&enet2 { + phy-handle = <&rgmii_phy3>; + phy-connection-type = "rgmii-id"; + status = "okay"; +}; + &i2c0 { status = "okay"; diff --git a/arch/arm/boot/dts/ls1021a-twr.dts b/arch/arm/boot/dts/ls1021a-twr.dts index a2c591e..4b61766 100644 --- a/arch/arm/boot/dts/ls1021a-twr.dts +++ b/arch/arm/boot/dts/ls1021a-twr.dts @@ -73,6 +73,26 @@ }; }; +&enet0 { + tbi-handle = <&tbi1>; + phy-handle = <&sgmii_phy2>; + phy-connection-type = "sgmii"; + status = "okay"; +}; + +&enet1 { + tbi-handle = <&tbi1>; + phy-handle = <&sgmii_phy0>; + phy-connection-type = "sgmii"; + status = "okay"; +}; + +&enet2 { + phy-handle = <&rgmii_phy1>; + phy-connection-type = "rgmii-id"; + status = "okay"; +}; + &i2c0 { status = "okay"; }; diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi index c70bb27..cc48d56 100644 --- a/arch/arm/boot/dts/ls1021a.dtsi +++ b/arch/arm/boot/dts/ls1021a.dtsi @@ -59,6 +59,9 @@ serial3 = &lpuart3; serial4 = &lpuart4; serial5 = &lpuart5; + ethernet0 = &enet0; + ethernet1 = &enet1; + ethernet2 = &enet2; sysclk = &sysclk; }; @@ -391,6 +394,95 @@ reg = <0x0 0x2d24000 0x0 0x4000>; }; + enet0: ethernet@2d10000 { + compatible = "fsl,etsec2"; + device_type = "network"; + #address-cells = <2>; + #size-cells = <2>; + interrupt-parent = <&gic>; + model = "eTSEC"; + fsl,magic-packet; + fsl,wake-on-filer; + local-mac-address = [ 00 00 00 00 00 00 ]; + ranges; + + queue-group@2d10000 { + #address-cells = <2>; + #size-cells = <2>; + reg = <0x0 0x2d10000 0x0 0x1000>; + interrupts = , + , + ; + }; + + queue-group@2d14000 { + #address-cells = <2>; + #size-cells = <2>; + reg = <0x0 0x2d14000 0x0 0x1000>; + interrupts = , + , + ; + }; + }; + + enet1: ethernet@2d50000 { + compatible = "fsl,etsec2"; + device_type = "network"; + #address-cells = <2>; + #size-cells = <2>; + interrupt-parent = <&gic>; + model = "eTSEC"; + local-mac-address = [ 00 00 00 00 00 00 ]; + ranges; + + queue-group@2d50000 { + #address-cells = <2>; + #size-cells = <2>; + reg = <0x0 0x2d50000 0x0 0x1000>; + interrupts = , + , + ; + }; + + queue-group@2d54000 { + #address-cells = <2>; + #size-cells = <2>; + reg = <0x0 0x2d54000 0x0 0x1000>; + interrupts = , + , + ; + }; + }; + + enet2: ethernet@2d90000 { + compatible = "fsl,etsec2"; + device_type = "network"; + #address-cells = <2>; + #size-cells = <2>; + interrupt-parent = <&gic>; + model = "eTSEC"; + local-mac-address = [ 00 00 00 00 00 00 ]; + ranges; + + queue-group@2d90000 { + #address-cells = <2>; + #size-cells = <2>; + reg = <0x0 0x2d90000 0x0 0x1000>; + interrupts = , + , + ; + }; + + queue-group@2d94000 { + #address-cells = <2>; + #size-cells = <2>; + reg = <0x0 0x2d94000 0x0 0x1000>; + interrupts = , + , + ; + }; + }; + usb@8600000 { compatible = "fsl-usb2-dr-v2.5", "fsl-usb2-dr"; reg = <0x0 0x8600000 0x0 0x1000>;