From patchwork Fri Dec 2 23:47:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 9459411 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 A405560515 for ; Fri, 2 Dec 2016 23:54:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8322028576 for ; Fri, 2 Dec 2016 23:54:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 74BDC28591; Fri, 2 Dec 2016 23:54:46 +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 0D9B028576 for ; Fri, 2 Dec 2016 23:54:46 +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 1cCxcU-00059j-Lp; Fri, 02 Dec 2016 23:51:58 +0000 Received: from mail-wj0-x241.google.com ([2a00:1450:400c:c01::241]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cCxc7-0004nq-42; Fri, 02 Dec 2016 23:51:36 +0000 Received: by mail-wj0-x241.google.com with SMTP id xy5so32036482wjc.1; Fri, 02 Dec 2016 15:51:14 -0800 (PST) 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=IJKkws5EPDfoxEPB+VuIqAHC0AsCmH/Hw8Cr6PBdZec=; b=xfY8jik1aB9eDqJvByymVsFBsKshq1qeDCWPuWbef2l6AXGVRxuFl7n5nFAL8/e2SC K2PXkElhLDAAZpd9cRd04dES4QviV5tJM8MOlW0wg7+n9Jf06LEOFSfpb5Jrqy518EPQ 8xkHFFLc9eaECyCFVy+cyPyyYYf88eaASk4epwShVgIt9xB7BI2qdxkHW4T5nXf8ifYb sAyNhhlV8wvRXSx/p+jGXxp9h0IFwOqHYQ6U0DbDSsCoEV5hq1a/2d1cIkpUi/dVwD2U jHGbbSTTlXEAnCdup8d2UJ3LrrtSy4LcxsRsc7oZ/KQwHpDh8Yc5GAiHcfXeDlOKxnkH MzMw== 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=IJKkws5EPDfoxEPB+VuIqAHC0AsCmH/Hw8Cr6PBdZec=; b=mKGNoQa+WMGAMq0MUNY9i76TMutvYOa/sIYyqoFZ/lNQYvJJH2NYaT9mDqPdDqPlel HJbBxrBSyZII2B4VzJ4sjWa9VeHec4dmI/MwH51uJ53hcVZ6sFxe8zKcXOJpuOLsQFyU 68bSceW7FPtfn5Et0PREwtsBEqG3im7KdYFFMHB/VLphXfFQ6ZLvGl+RLd/lPYuhDiyj ruUOBDD1+gvH23TeKettFQ1Eq1VwdEUIbXcJpVHs1kJNyiDsA6dro22FRuscVQubCCtJ HJlQQH7emIxlPfJq1r1q/2dCdAolg1mAjUE67YpteMYL01lwqPAal00JO/Y1NZ46TfDx IQ3w== X-Gm-Message-State: AKaTC02mBebZuUPpy7Oa6WW0B5EIEqT58F1rnHMo2OjYAExfLE3Mgz4z7KZZaB/XvOx3hg== X-Received: by 10.194.111.102 with SMTP id ih6mr39431540wjb.214.1480722673527; Fri, 02 Dec 2016 15:51:13 -0800 (PST) Received: from blackbox.darklights.net (p200300DCD3F345041935DCECF29CCAC0.dip0.t-ipconnect.de. [2003:dc:d3f3:4504:1935:dcec:f29c:cac0]) by smtp.googlemail.com with ESMTPSA id n17sm7926945wjq.6.2016.12.02.15.51.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Dec 2016 15:51:12 -0800 (PST) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, khilman@baylibre.com, carlo@caione.org Subject: [PATCH 1/5] ARM64: dts: meson-gx: move the MDIO node to meson-gx Date: Sat, 3 Dec 2016 00:47:35 +0100 Message-Id: <20161202234739.22929-2-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161202234739.22929-1-martin.blumenstingl@googlemail.com> References: <20161202234739.22929-1-martin.blumenstingl@googlemail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161202_155135_369188_C4011EFD X-CRM114-Status: UNSURE ( 9.33 ) X-CRM114-Notice: Please train this message. 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, 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 stmmac's MDIO bus is currently only defined in meson-gxl.dtsi. Move it up to meson-gx to allow us to keep the stmmac configuration for meson-gxbb similar to the configuration on meson-gxl. Signed-off-by: Martin Blumenstingl Tested-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 6 ++++++ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index 47ab306..a2c3ca6 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -371,6 +371,12 @@ interrupt-names = "macirq"; phy-mode = "rgmii"; status = "disabled"; + + mdio0: mdio { + #address-cells = <1>; + #size-cells = <0>; + compatible = "snps,dwmac-mdio"; + }; }; apb: apb@d0000000 { diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi index 9f89b99..d338f9b 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi @@ -57,12 +57,6 @@ <&clkc CLKID_FCLK_DIV2>, <&clkc CLKID_MPLL2>; clock-names = "stmmaceth", "clkin0", "clkin1"; - - mdio0: mdio { - #address-cells = <1>; - #size-cells = <0>; - compatible = "snps,dwmac-mdio"; - }; }; &aobus {