From patchwork Tue Sep 6 21:38:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 9317925 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EF54C60760 for ; Tue, 6 Sep 2016 21:39:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 07AA928ED2 for ; Tue, 6 Sep 2016 21:39:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F060528EF5; Tue, 6 Sep 2016 21:39:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 6B0C028ED2 for ; Tue, 6 Sep 2016 21:39:51 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bhO5q-0006YP-JM; Tue, 06 Sep 2016 21:39:46 +0000 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bhO5Z-0006Pj-Oh; Tue, 06 Sep 2016 21:39:30 +0000 Received: by mail-wm0-x244.google.com with SMTP id l65so12899401wmf.3; Tue, 06 Sep 2016 14:39:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4TgBHdt0ty+/OhfIdGUClBnyLwyQzvulNCSm64zXAxo=; b=rXEcwbTCJG1CPqnYWklnglxFukCp3+1ugsRZu88l61vq+wQahdyAXxoUQLa/oITusG e43TFK8B9dCLZu5/Z5onPZQiS6ItTf3uncyYI8rkENd0gYKHec0mluRFEb8BGbHOwE8l qi+lWG3lQEQTQwtPO0yQ8ulMSY3mnS1G3HhjdOEGViEvYZiSrg7UBW38H9XinaL848Of WD+X9UaI/AEnY6Ci/G7jj+IQi95lzQQdjWK2evuukoQ+tj11yNOV8QBl7AiwHwM6AK1Z V6KZnc3P6YKMt5YUogWSzJx11aayAHSvnwE8u0QCkuq2pVXMrsGfT7w3StY7SWjp5RHk UEvw== 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=4TgBHdt0ty+/OhfIdGUClBnyLwyQzvulNCSm64zXAxo=; b=Y5KpljWVDZcp9iZsuas/bRM+EETXEBOjfMcYxFNZwDE5ZQDpZhy1LJszu7Qhpkhuir xYgbDT6x5DXXpBubd8pQTifC6J1qd7R/DylPps7mTzaHywUNHHt5Gch4lMZnDyygq2G8 3OZ3StG0oI46EzXhbXWWNNLSuUUPEIDEt7I/8fk9yQe0q2y+R/Net/Kpk52TqLYo5OIk 5ZIRVRPLtOzH0jt4tr5yZAFZVDYXRjlNUaJQwOR3WWygfntkvvK7f/ynzPDlRw6JEj9O Xoe9APCLjjZM019bhciSIuJiWpGYPYSEcO7dxCAe0hxXUArceo8/jDpHwirm4sMXtgIR dWrg== X-Gm-Message-State: AE9vXwMATkpzqY3Id9avyHTPR68CQg5TS4BC0RZPUk6BC6Jy2g59w3A1Z6gbjKpUWXA+Xw== X-Received: by 10.194.58.112 with SMTP id p16mr36854676wjq.24.1473197948326; Tue, 06 Sep 2016 14:39:08 -0700 (PDT) Received: from blackbox.darklights.net (p5DE38590.dip0.t-ipconnect.de. [93.227.133.144]) by smtp.googlemail.com with ESMTPSA id 188sm812948wmo.4.2016.09.06.14.39.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Sep 2016 14:39:07 -0700 (PDT) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, khilman@baylibre.com, carlo@caione.org, mturquette@baylibre.com, peppe.cavallaro@st.com, alexandre.torgue@st.com Subject: [PATCH v5 1/6] net: dt-bindings: Document the new Meson8b and GXBB DWMAC bindings Date: Tue, 6 Sep 2016 23:38:43 +0200 Message-Id: <20160906213848.17785-2-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160906213848.17785-1-martin.blumenstingl@googlemail.com> References: <20160904182320.671-1-martin.blumenstingl@googlemail.com> <20160906213848.17785-1-martin.blumenstingl@googlemail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160906_143930_025345_FD175D84 X-CRM114-Status: GOOD ( 12.73 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, arnd@arndb.de, Martin Blumenstingl , catalin.marinas@arm.com, manabian@gmail.com, will.deacon@arm.com, davem@davemloft.net, b.galvani@gmail.com, robh+dt@kernel.org, netdev@vger.kernel.org, sboyd@codeaurora.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds the documentation for the DWMAC ethernet controller found in Amlogic Meson 8b (S805) and GXBB (S905) SoCs. The main difference between the Meson6 glue is that different registers (with different layout) are used. Signed-off-by: Martin Blumenstingl Acked-by: Rob Herring Acked-by: David S. Miller --- .../devicetree/bindings/net/meson-dwmac.txt | 45 ++++++++++++++++++---- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/net/meson-dwmac.txt b/Documentation/devicetree/bindings/net/meson-dwmac.txt index ec633d7..89e62dd 100644 --- a/Documentation/devicetree/bindings/net/meson-dwmac.txt +++ b/Documentation/devicetree/bindings/net/meson-dwmac.txt @@ -1,18 +1,32 @@ * Amlogic Meson DWMAC Ethernet controller The device inherits all the properties of the dwmac/stmmac devices -described in the file net/stmmac.txt with the following changes. +described in the file stmmac.txt in the current directory with the +following changes. -Required properties: +Required properties on all platforms: -- compatible: should be "amlogic,meson6-dwmac" along with "snps,dwmac" - and any applicable more detailed version number - described in net/stmmac.txt +- compatible: Depending on the platform this should be one of: + - "amlogic,meson6-dwmac" + - "amlogic,meson8b-dwmac" + - "amlogic,meson-gxbb-dwmac" + Additionally "snps,dwmac" and any applicable more + detailed version number described in net/stmmac.txt + should be used. -- reg: should contain a register range for the dwmac controller and - another one for the Amlogic specific configuration +- reg: The first register range should be the one of the DWMAC + controller. The second range is is for the Amlogic specific + configuration (for example the PRG_ETHERNET register range + on Meson8b and newer) -Example: +Required properties on Meson8b and newer: +- clock-names: Should contain the following: + - "stmmaceth" - see stmmac.txt + - "clkin0" - first parent clock of the internal mux + - "clkin1" - second parent clock of the internal mux + + +Example for Meson6: ethmac: ethernet@c9410000 { compatible = "amlogic,meson6-dwmac", "snps,dwmac"; @@ -23,3 +37,18 @@ Example: clocks = <&clk81>; clock-names = "stmmaceth"; } + +Example for GXBB: + ethmac: ethernet@c9410000 { + compatible = "amlogic,meson-gxbb-dwmac", "snps,dwmac"; + reg = <0x0 0xc9410000 0x0 0x10000>, + <0x0 0xc8834540 0x0 0x8>; + interrupts = <0 8 1>; + interrupt-names = "macirq"; + clocks = <&clkc CLKID_ETH>, + <&clkc CLKID_FCLK_DIV2>, + <&clkc CLKID_MPLL2>; + clock-names = "stmmaceth", "clkin0", "clkin1"; + phy-mode = "rgmii"; + status = "disabled"; + };