From patchwork Sun Aug 28 16:16:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 9302787 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 72CB66077C for ; Sun, 28 Aug 2016 16:21:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6250C28826 for ; Sun, 28 Aug 2016 16:21:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 560E528829; Sun, 28 Aug 2016 16:21:06 +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 E3C7C28826 for ; Sun, 28 Aug 2016 16:21:05 +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 1be2o5-0006X2-Mn; Sun, 28 Aug 2016 16:19:37 +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 1be2lt-0005FC-Ii; Sun, 28 Aug 2016 16:17:25 +0000 Received: by mail-wm0-x241.google.com with SMTP id i138so6401413wmf.3; Sun, 28 Aug 2016 09:17:04 -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=SE9SpR88usolbQYwqWa5sjZPXy4m1D4Oeii0PRQrNqSBIqLCvneTSGET/lRNZdw6so Y6y/dyxmcf4ANfl51+qQdJ3lxrzpeEma9bLYCxctJIJ+sZ9ILDZIlYylD+MRrKoFzeHS 5F+D8Li5h1LE0gyAa/ZT3zf5riWq5poMZHkBxOFQnR29kfI0l20iIm7ykwFa6RqnZ4Ae VWSc001fIJsvts1f/6SImQ0G6DG0GkvarlwHGvbLvlq4ifDiAgiamuy3IadHbMw5AR5N CpRXRQbrYzq83GZa5NGdV0FmiNythByqp9ANcKC/9vW7IrlBQlPbasO54yiaX4il5spz tG3w== 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=UfmN7aBEk+IMtLVe/OY+pSdf5gB0LvIDVIzRK9e+g9ysSodKmnBJHWSwsfWAe+Tjcw S2ToIUB8GFGNbNyDmIicQqwA56rmtyfS39voGNFNTCVhrn6Gb/RAPGNFBgTUrOV/pGWm Uv1Qh9OAxQtxSVDjoXSC8bVUWd2HtX/zmO7MpHwnNOlCtN//Xj5P7Pf9z0lC0V+8XRp3 TDlYomesGiJActkPxdPLanwSUYzriQGKQr7sjlzXvSLPMeRxlDVt0pF2aA5jYBmxq/Nc oTciHqpHxajTUtxMU+J1Q/kBF8pCeMZYEp3OdkD1kRObe5ylQhXifi2BsJjhKNT9k2Ze Iwww== X-Gm-Message-State: AE9vXwPZ008nstSP22mifRtJLsG2rPRLO0A9TegrEZOl3I2c0/nc/NOEhke6Y/4KZ/TKNw== X-Received: by 10.28.17.138 with SMTP id 132mr6557251wmr.81.1472401023397; Sun, 28 Aug 2016 09:17:03 -0700 (PDT) Received: from blackbox.darklights.net (p200300DCD3CD1604DDE8B455CCB566F1.dip0.t-ipconnect.de. [2003:dc:d3cd:1604:dde8:b455:ccb5:66f1]) by smtp.googlemail.com with ESMTPSA id ly9sm29987769wjb.44.2016.08.28.09.17.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Aug 2016 09:17:02 -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 v3 5/5] ARM64: dts: meson-gxbb: use the new GXBB DWMAC glue driver Date: Sun, 28 Aug 2016 18:16:37 +0200 Message-Id: <20160828161637.9941-6-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160828161637.9941-1-martin.blumenstingl@googlemail.com> References: <20160820093538.9707-1-martin.blumenstingl@googlemail.com> <20160828161637.9941-1-martin.blumenstingl@googlemail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160828_091722_010259_E0CC9BE6 X-CRM114-Status: GOOD ( 10.15 ) 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, 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"; };