From patchwork Sat Aug 20 09:35:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 9291663 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 91BC160572 for ; Sat, 20 Aug 2016 09:38:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D2D02903B for ; Sat, 20 Aug 2016 09:38:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 71E5829071; Sat, 20 Aug 2016 09:38:45 +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 2E09E2903B for ; Sat, 20 Aug 2016 09:38:45 +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 1bb2iU-0004vZ-55; Sat, 20 Aug 2016 09:37:26 +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 1bb2hQ-0004bs-O9; Sat, 20 Aug 2016 09:36:22 +0000 Received: by mail-wm0-x244.google.com with SMTP id i5so6236091wmg.2; Sat, 20 Aug 2016 02:36:03 -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=V8zrAHLx+hqzURXCwqyori8fD7q5RdJy7GX72n6q3Yk=; b=J7OGWp4/p5hfyYD6gpzphryDMrfQrIO5gW5N7iZLpONzk0fvBsfQshC/WXbG8u41OQ v8fnloFoKppRucjwnyGdaW0OZ2DrIRLhfSoZs/7BKvcZfMewnp+ywMUAgrWAtgqRKv2g tGJhrr8ynHG6QbNH8cuSi+AYgihrNk+SQpiKX/Y0ZeAtbL89mgRt7fz6gvFPTblfwymI rZpy06jXXocJRNdAkfVbX8JOab55iBefqPDxcRUC9vV5eOWSFzgOqiQ3BUPUCas38nrO 1yn44ovVsSZUe8eovB4qMuA7z7RUyOlVTPvqvkkx0x7fGYkmWmdgI5pFAYb7tZzh3pU4 q77Q== 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=V8zrAHLx+hqzURXCwqyori8fD7q5RdJy7GX72n6q3Yk=; b=kh1LJ13V0UeCR2SiX1NC/rGdNQMlgK/WnEfVliESaRbwzvkzvlULcNlLmx8OGbd2cP RkZxCWJndG6hKX1r0edPjMix0cEJEKD8iHEPxLt1kU46VZ9rHk+ZrdMAp87YDF9gWJ9L h9C8UvmoXqQoNjokCkXCw16bnrdOp1A4YDe761GnikubaXFfEmsLVWIgP3iixWErnAum TBu1HAYrf6M0j5FvSIJI8hnu4ndCuZl3NAtXAzA214Lli0Vq6ucqnI0fcVVQKNZcwGvF OQ3xgU6BXr/TwUy69gV2JjnzyvJyhAHtQ+z2OKM1M3ojLF1vjgiWZGU2xoU9G9ICoZ5Z HExg== X-Gm-Message-State: AEkoouvTL9q4J77CGbgAdkCTjWcB438domsnI2Uh6WFLUqEagu6R6jOGgN0zChXjM61wfg== X-Received: by 10.28.19.134 with SMTP id 128mr7082429wmt.40.1471685762101; Sat, 20 Aug 2016 02:36:02 -0700 (PDT) Received: from blackbox.darklights.net (p5DE388BA.dip0.t-ipconnect.de. [93.227.136.186]) by smtp.googlemail.com with ESMTPSA id e10sm11047038wjc.21.2016.08.20.02.36.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Aug 2016 02:36:01 -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 v2 4/4] ARM64: dts: meson-gxbb: use the new GXBB DWMAC glue driver Date: Sat, 20 Aug 2016 11:35:38 +0200 Message-Id: <20160820093538.9707-5-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160820093538.9707-1-martin.blumenstingl@googlemail.com> References: <20160815164100.27766-1-martin.blumenstingl@googlemail.com> <20160820093538.9707-1-martin.blumenstingl@googlemail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160820_023621_068311_382C79B4 X-CRM114-Status: GOOD ( 10.03 ) 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: 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, sboyd@codeaurora.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The Amlogic reference driver uses the "mc_val" devicetree property to configure the PRG_ETHERNET_ADDR0 register. Unfortunately it uses magic values for this configuration. According to the datasheet the PRG_ETHERNET_ADDR0 register is at address 0xc8834108. However, the reference driver uses 0xc8834540 instead. According to my tests, the value from the reference driver is correct. No changes are required to the board dts files because the only required configuration option is the phy-mode, which had to be configured correctly before as well. Signed-off-by: Martin Blumenstingl --- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index 4f42316..ab817d3 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -373,13 +373,15 @@ }; ethmac: ethernet@c9410000 { - compatible = "amlogic,meson6-dwmac", "snps,dwmac"; + compatible = "amlogic,meson-gxbb-dwmac", "snps,dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x4>; interrupts = <0 8 1>; interrupt-names = "macirq"; - clocks = <&clkc CLKID_ETH>; - clock-names = "stmmaceth"; + clocks = <&clkc CLKID_ETH>, + <&clkc CLKID_FCLK_DIV2>, + <&clkc CLKID_MPLL2>; + clock-names = "stmmaceth", "clkin0", "clkin1"; phy-mode = "rgmii"; status = "disabled"; };