From patchwork Mon Aug 15 16:40:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 9281573 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 D606B600CB for ; Mon, 15 Aug 2016 16:42:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C69C828DE8 for ; Mon, 15 Aug 2016 16:42:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BAF8328DF1; Mon, 15 Aug 2016 16:42:35 +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 4763128DE8 for ; Mon, 15 Aug 2016 16:42:35 +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 1bZKy3-0007kp-1e; Mon, 15 Aug 2016 16:42:27 +0000 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bZKxK-0007LW-Bl; Mon, 15 Aug 2016 16:41:45 +0000 Received: by mail-wm0-x241.google.com with SMTP id i138so11958896wmf.3; Mon, 15 Aug 2016 09:41:21 -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=0k86D0y1Y79RnZAQRSZVKRqSG+FQ2ukIuKjCbwLD1xk=; b=VoMjyv3i4958kgrDHi4mbpjhHw9e45xXEatJg1/wJn8BmaCYERqVD2iyikeOmIh0Cf IGrnjVNnOCnMnflFPWfI32RXU9ORxaORbmeOqXqkzlTgr9M+i3mNo8fdjXJKNHt3WnJO LaE7ppmWcTFYmw2CX3oEbA+Wv0oVcy6OU+G6pyqlnGxhD+GosrKcV2L4iawOhTSqKIEA Ynp9KIDp8dVfRBDFCoXcdlI1utBXlWMpH2mZC2qNnW27r7d+Ep9J6+TALoJWsHwFY8TF 9aioX74AWuZmcVmo7YcBLFsjvrUh+QPzJZBBscMKtP/2xVtQPdQ2VWoLXxzCRXLVrSjU cFIQ== 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=0k86D0y1Y79RnZAQRSZVKRqSG+FQ2ukIuKjCbwLD1xk=; b=JzZ/wPJUEY7Zi9aTXTn1WbI1Io4rLOKwisdjX0ObeLjpp4D5qdZFwdADOQs36bknO2 3LMnbFOsAHM9l0RSb4I3giThAnEGZE+yiUVgUS/9fHZMndt+3IOLGVtAehEvRuiO/xLI 6jJrbEaoCeNdUcV2ghKI444AAEqmJoEuIHKZp7fktKkuwVeHQQJfEORqDnW7gc5DUZfn xm5pJrkpToRa/OAiQ+P87FhzQWrqcg4Ut9HxALwvwHb//IkbOQdTHXKmBV9dDUWHjy9+ sXJZleatYu7mRnxUZ1MMyEjkQVpRLn6tXubV2udM8g94VzxlLG6DPkxeZ8UqbXFf15E4 s9yg== X-Gm-Message-State: AEkooutnJeN0PoDLzQK4O2Um1kDgWSqbD8qX0K/P8b/to0GwKTSNuwz2jeZtw00lffQmOQ== X-Received: by 10.28.223.9 with SMTP id w9mr15173250wmg.65.1471279280480; Mon, 15 Aug 2016 09:41:20 -0700 (PDT) Received: from blackbox.darklights.net (p5DE388ED.dip0.t-ipconnect.de. [93.227.136.237]) by smtp.googlemail.com with ESMTPSA id f187sm17395375wmf.15.2016.08.15.09.41.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Aug 2016 09:41:19 -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 1/3] net: dt-bindings: Document the new Meson8b and GXBB DWMAC bindings Date: Mon, 15 Aug 2016 18:40:58 +0200 Message-Id: <20160815164100.27766-2-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160815164100.27766-1-martin.blumenstingl@googlemail.com> References: <20160625165013.15917-1-martin.blumenstingl@googlemail.com> <20160815164100.27766-1-martin.blumenstingl@googlemail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160815_094142_716528_A271E330 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, Martin Blumenstingl , catalin.marinas@arm.com, will.deacon@arm.com, robh+dt@kernel.org, netdev@vger.kernel.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 --- .../devicetree/bindings/net/meson-dwmac.txt | 43 ++++++++++++++++++---- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/net/meson-dwmac.txt b/Documentation/devicetree/bindings/net/meson-dwmac.txt index ec633d7..8db6899 100644 --- a/Documentation/devicetree/bindings/net/meson-dwmac.txt +++ b/Documentation/devicetree/bindings/net/meson-dwmac.txt @@ -1,18 +1,31 @@ * 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" - parent clock of internal mux (usually FCLK_DIV2) + + +Example for Meson6: ethmac: ethernet@c9410000 { compatible = "amlogic,meson6-dwmac", "snps,dwmac"; @@ -23,3 +36,17 @@ 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>; + clock-names = "stmmaceth", "clkin0"; + phy-mode = "rgmii"; + status = "disabled"; + };