From patchwork Tue Mar 25 23:34:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dinh Nguyen X-Patchwork-Id: 3891351 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 5D7BEBF540 for ; Tue, 25 Mar 2014 23:39:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 77D992012E for ; Tue, 25 Mar 2014 23:39:08 +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 7C5D02014A for ; Tue, 25 Mar 2014 23:39:07 +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 1WSav0-0005CG-6y; Tue, 25 Mar 2014 23:38:06 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WSaun-0006SH-7w; Tue, 25 Mar 2014 23:37:53 +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 1WSauJ-0006Od-BA for linux-arm-kernel@lists.infradead.org; Tue, 25 Mar 2014 23:37:26 +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:37:00 +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:37:00 +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:57 -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 s2PNargD018949; Tue, 25 Mar 2014 16:36:57 -0700 (PDT) From: To: , , , Subject: [PATCH 3/3] dts: documentation: Update documentation for the stmmac ethernet controller Date: Tue, 25 Mar 2014 18:34:42 -0500 Message-ID: <1395790482-3957-4-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)(575784001)(5022600?= =?us-ascii?Q?1)(97186001)(6806004)(80022001)(65816001)(62966002)(97336001?= =?us-ascii?Q?)(44976005)(74876001)(95666003)(83322001)(19580405001)(33646?= =?us-ascii?Q?001)(51856001)(93136001)(81816001)(81342001)(83072002)(74366?= =?us-ascii?Q?001)(86362001)(4396001)(93516002)(81686001)(85852003)(767860?= =?us-ascii?Q?01)(86152002)(98676001)(2201001)(92726001)(92566001)(4773600?= =?us-ascii?Q?1)(81542001)(50986001)(49866001)(47976001)(53416003)(4837600?= =?us-ascii?Q?2)(93916002)(94316002); DIR:OUT; SFP:1102; SCL:1; SRVR:BL2FFO11H?= =?us-ascii?Q?UB010; H:SJ-ITEXEDGE02.altera.priv.altera.com; FPR:AC50F66E.B9?= =?us-ascii?Q?2605C9.5FFC9742.CD6F95F.20314; MLV:sfv; PTR:InfoDomainNonexist?= =?us-ascii?Q?ent;A:1;MX: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_193723_446934_B2C67D55 X-CRM114-Status: UNSURE ( 9.89 ) 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 * Add optional clocks and clock-names property into the base stmmac document. * Update socfpga-dwmac.txt with new compatible string and example binding. Signed-off-by: Arnd Bergmann Signed-off-by: Dinh Nguyen --- .../devicetree/bindings/net/socfpga-dwmac.txt | 38 ++++++++------------ Documentation/devicetree/bindings/net/stmmac.txt | 6 ++++ 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/Documentation/devicetree/bindings/net/socfpga-dwmac.txt b/Documentation/devicetree/bindings/net/socfpga-dwmac.txt index d53d376..1ef6db7 100644 --- a/Documentation/devicetree/bindings/net/socfpga-dwmac.txt +++ b/Documentation/devicetree/bindings/net/socfpga-dwmac.txt @@ -1,35 +1,27 @@ Altera SOCFPGA SoC DWMAC controller -The device node has following properties. +This is a variant of the dwmac/stmmac driver an inherits all descriptions +present in Documentation/devicetree/bindings/net/stmmac.txt. + +The device node has additional properties: Required properties: - - compatible : Should contain "altr,socfpga-stmmac" + - compatible : Should contain "altr,socfpga-stmmac" along with + "snps,dwmac" and any applicable more detailed + designware version numbers documented in stmmac.txt - altr,sysmgr-syscon : Should be the phandle to the system manager node that encompasses the glue register, and the register offset. -Sub-nodes: -The dwmac core should be added as subnode to SOCFPGA dwmac glue. -- dwmac : The binding details of dwmac can be found in - Documentation/devicetree/bindings/net/stmmac.txt - Example: -ethernet0: ethernet0 { - #address-cells = <1>; - #size-cells = <1>; - - compatible = "altr,socfpga-stmmac"; +gmac0: ethernet@ff700000 { + compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a", "snps,dwmac"; altr,sysmgr-syscon = <&sysmgr 0x60>; 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"; - }; + 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>; + clocks-names = "stmmaceth"; }; diff --git a/Documentation/devicetree/bindings/net/stmmac.txt b/Documentation/devicetree/bindings/net/stmmac.txt index 9d92d42..9a0c1b7 100644 --- a/Documentation/devicetree/bindings/net/stmmac.txt +++ b/Documentation/devicetree/bindings/net/stmmac.txt @@ -34,6 +34,10 @@ Optional properties: reset phandle is given - max-frame-size: Maximum Transfer Unit (IEEE defined MTU), rather than the maximum frame size. +- clocks: If present, the first clock should be the GMAC main clock, + further clocks may be specified in derived bindings. +- clocks-names: One name for each entry in the clocks property, the + first one should be "stmmaceth". Examples: @@ -46,4 +50,6 @@ Examples: mac-address = [000000000000]; /* Filled in by U-Boot */ max-frame-size = <3800>; phy-mode = "gmii"; + clocks = <&clock>; + clock-names = "stmmaceth">; };