From patchwork Tue Sep 6 21:38:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 9317937 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 46AA660760 for ; Tue, 6 Sep 2016 21:41:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5177128EF5 for ; Tue, 6 Sep 2016 21:41:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 463C328F00; Tue, 6 Sep 2016 21:41:31 +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 5397128EF5 for ; Tue, 6 Sep 2016 21:41:30 +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 1bhO6B-0006sG-W1; Tue, 06 Sep 2016 21:40:08 +0000 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bhO5c-0006QM-RB; Tue, 06 Sep 2016 21:39:34 +0000 Received: by mail-wm0-x242.google.com with SMTP id a6so9498621wmc.2; Tue, 06 Sep 2016 14:39:16 -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=8+YZsxyNWXGYwP0tJDKdW5m6Pm+aRVKrsBPIOcz7Vz4=; b=Ry7UiLQlF5qMQbeAHsGChceMMedVGeVqeRNWPlFp/r21BDfurJ8nL2ULHcC9GC800p DMIHZgdr5pCfQ1VOpUydljoYh5Urufzcm7NcdLpylof+f8oPLiJVZWFIZvLyEW+oHSlY qYnzOi0cu7Y9nO4sObYTx1SrIlpMUPB3EMxc2Ty2Wu5//JFZV4BrWloi5H9iHKxluPOu mg3+6RZ1rfxuoXGZ5Q81hVP2A15oIWvqQVrLO5RgchoXCLLtC2o6uwvMXeMt5VTYK1Ja tm1Q/Qbn6BG4xgJe3Fu2m68xIkkP2eFLqkRmospz7qulaU498Z77hIM9ld4HGWnO0DLv 2f3A== 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=8+YZsxyNWXGYwP0tJDKdW5m6Pm+aRVKrsBPIOcz7Vz4=; b=FowG3x/vFEE4ujYb9IoGX5dwWrxjgl2WZ6f1JtgsFq4E8e4NJGCpN60jRftXvALi4z zAM/N3yM3zANZuIllPAtSKIoUTMb22PEyyEeF/ZRE7PBAhWIJX8wHR5lUcbQWjrBGXje ZUnGYeRxxHZ8QQBnFx+Qy7INc99meTZWgWhUr1+PD5N0jdSkEBCnbN4SCX8WCRZAvBQM gPTj9CKrosWihDhQOA9ooEJJtHUT9vXqK+Cr81h7TkSOPoanSuaHJZuX7IIS2Pzk4q7M vRSE14Imaay7jcAZ3JhpNB54crFGNyLJssjwhko3lTyHpTN3189/XYvZjwufpM9aAmHp QCYw== X-Gm-Message-State: AE9vXwMe4PqfIcY2Sxnr7TEgdViRrIWLKlgylPeMqakAlzi4xVARN39SdvVuWoCKMH3a3A== X-Received: by 10.28.109.196 with SMTP id b65mr692584wmi.68.1473197955049; Tue, 06 Sep 2016 14:39:15 -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.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Sep 2016 14:39:14 -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 5/6] ARM64: dts: meson-gxbb: use the new GXBB DWMAC glue driver Date: Tue, 6 Sep 2016 23:38:47 +0200 Message-Id: <20160906213848.17785-6-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_143933_128188_475D985C X-CRM114-Status: GOOD ( 10.73 ) 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, 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-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 2b47415..2e8a3d9 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -497,13 +497,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"; };