From patchwork Fri Nov 25 13:01:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 9447511 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 1DF0C60778 for ; Fri, 25 Nov 2016 13:03:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0BFC327FAD for ; Fri, 25 Nov 2016 13:03:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 00AD528047; Fri, 25 Nov 2016 13:03:21 +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 3462E2808F for ; Fri, 25 Nov 2016 13:03:14 +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 1cAG9h-00057h-4v; Fri, 25 Nov 2016 13:03:05 +0000 Received: from mail-wj0-x242.google.com ([2a00:1450:400c:c01::242]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cAG9T-0004Rm-1x; Fri, 25 Nov 2016 13:02:58 +0000 Received: by mail-wj0-x242.google.com with SMTP id kp2so5533335wjc.0; Fri, 25 Nov 2016 05:02:30 -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=re3MPqjPNTgZTDSVRKvetIT8n4RnQP3J6jwF7Ju4mH0=; b=AnvUWTmuO2k3DNFir+x7UcyYAPm3uzwPO3L2WPPrr+Y8kqQF+eLWqvBSwzf8qbLmlO Y5d1ZPBqqBW4+5Fxkum1XqO0tuCWednQLBRhWZqqDPxZ73uW2e7ZLpMEfHOAOWBflvFX Ab72Xcy/CRJghx9qVYxXxDu1ib1zRF4Lkq+CFM5GWkyy84ZDfx49H7oGJPZ44Cszusb6 Xpo7m+1soC+acivAjGsVXztXg1+tS9q4hTjSGBFKTz29qA9SymUO/e5a7u7ehD8l4knI JjMHLvlgUsfibKHNYhY+dltI1RxPOmYehma5ST8Sw5XNrA9nwhvEEZtB4aFt5xZyCRG3 z0cw== 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=re3MPqjPNTgZTDSVRKvetIT8n4RnQP3J6jwF7Ju4mH0=; b=YPsEEIh9aX7domMThSryQLfew7nOPyVif0C9DKFPVD9bwjMZNq9qwsRBTVBAA0oEdI Z7PJ/Q/CYgIIQb/N1tuBDEJElrimHz9CFpXXZyaJbHCSQEx8m0qhpbwSwYylHKO+SGhv HbY6dtzDiipyfsNcj79PcA9vuCUch2SQQ2VRkVpiI8+MUJmKWPMx6taySi0eVK/6zziP xWWXey6UKOjHUWte7I4JmoyrKygfsVIiVd852FfDxXysSjkgJgRa1oIMv2mjt1OOa9Gp eOZR1cTJNL27xSYBUmyNSoy4lfrTJDbz0p95QG3UEJZXkR/mPCEiMYGKHPogVLgHiNnz GXDw== X-Gm-Message-State: AKaTC02/muWL3w4TeWFxutdftCVz8/Ch88kb7JnzVuXRHnzQQ8xJa5eF4H9b4YjpfBiK7g== X-Received: by 10.194.94.166 with SMTP id dd6mr8110824wjb.88.1480078948958; Fri, 25 Nov 2016 05:02:28 -0800 (PST) Received: from blackbox.darklights.net ([2003:dc:d3d3:9204:9426:48db:352f:a6de]) by smtp.googlemail.com with ESMTPSA id ua15sm46937433wjb.1.2016.11.25.05.02.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Nov 2016 05:02:28 -0800 (PST) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, devicetree@vger.kernel.org, netdev@vger.kernel.org, davem@davemloft.net, khilman@baylibre.com, mark.rutland@arm.com, robh+dt@kernel.org Subject: [PATCH v2 3/7] ARM64: dts: meson-gx: move the MDIO node to meson-gx Date: Fri, 25 Nov 2016 14:01:52 +0100 Message-Id: <20161125130156.17879-4-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161125130156.17879-1-martin.blumenstingl@googlemail.com> References: <20161124143417.10178-1-martin.blumenstingl@googlemail.com> <20161125130156.17879-1-martin.blumenstingl@googlemail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161125_050251_472094_873B3373 X-CRM114-Status: UNSURE ( 9.30 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: f.fainelli@gmail.com, alexandre.torgue@st.com, Martin Blumenstingl , catalin.marinas@arm.com, will.deacon@arm.com, carlo@caione.org, peppe.cavallaro@st.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=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 --- 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 3af54dc..aa3cd80 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 {