From patchwork Sun Sep 4 18:23:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 9312723 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 0B0D3600CA for ; Sun, 4 Sep 2016 18:26:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 00E512887C for ; Sun, 4 Sep 2016 18:26:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E98632887E; Sun, 4 Sep 2016 18:26:30 +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 78E392887C for ; Sun, 4 Sep 2016 18:26: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 1bgc6G-0006Yv-J3; Sun, 04 Sep 2016 18:25:00 +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 1bgc59-0005vH-79; Sun, 04 Sep 2016 18:23:53 +0000 Received: by mail-wm0-x244.google.com with SMTP id l65so2370601wmf.3; Sun, 04 Sep 2016 11:23:34 -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=JASs6Ro+FN/4WGpz/T06qHJyladB1AZWQtzDMKgyE8dWj5k4B/COTa0eXzB9hzevhN bssKCCBe09T1BXp8xjDzzpkcj2LaaSbEZ0MsV3KKKAyP32Gch+pXgIlgchVEDu5Y8f4Z dakCPM5UsQosr130X7ek84X9FtqZL/TgTm7mlWYf95LG2LbN+JXkO+iPcaHSXi+SyMEl SKX1ckJx9MsZJioQn4UchxH22N97tDSw/E1oaBdedlDRN5S+mIUc8Pc3V5GT08xxET1t n/iNPkIcKw4lwrMmSBT/fbcBEzOel7XnKl8qgDjApAx73vz5zODpS23exwppGcPNENzp 4qQQ== 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=B/xLlSFX/q2ttUU7HtbkBrxqgJQjAiR1rMP7GXdVYqIx75lyojaqvg/QiviBTAB1sV g7wKjUi4yzk0tEaudMgjt4A3ntO6x3WLFOR4f5aqTkk+JqBM6oPpOXMrUG5TtRO93dgc x4BiqYzxnGFsGQjM2uHxq/RRdTRnJczIhn8KKu7VRTs+87HqIMDKI+SSbKqZ0N2igzsn FAAyfsnWDaADmjMQhP4LRPt9k47bUnQb0CeZj741pDL050veofUd5Gyu0jKCXph84/fQ pXUx3S/B6fLrGXGVRk9oOGFk2E298k4XAExFiqw8ssMKyWsZzmzyXzEaiSmxRPR7EiYk Pbnw== X-Gm-Message-State: AE9vXwOzt6SibffICAXjTaDBb34uHgSK35a8Is3TXqtKZbArfwjx1+01fJOKBnrCT9ZJ/g== X-Received: by 10.28.48.71 with SMTP id w68mr12674854wmw.4.1473013413028; Sun, 04 Sep 2016 11:23:33 -0700 (PDT) Received: from blackbox.darklights.net (p200300DCD3CA8104A82AA8E503619161.dip0.t-ipconnect.de. [2003:dc:d3ca:8104:a82a:a8e5:361:9161]) by smtp.googlemail.com with ESMTPSA id cw7sm22669012wjb.38.2016.09.04.11.23.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Sep 2016 11:23:32 -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 v4 5/5] ARM64: dts: meson-gxbb: use the new GXBB DWMAC glue driver Date: Sun, 4 Sep 2016 20:23:20 +0200 Message-Id: <20160904182320.671-6-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160904182320.671-1-martin.blumenstingl@googlemail.com> References: <20160828161637.9941-1-martin.blumenstingl@googlemail.com> <20160904182320.671-1-martin.blumenstingl@googlemail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160904_112351_548170_221EA9F4 X-CRM114-Status: GOOD ( 10.20 ) 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, 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"; };