From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754314AbcKUXmm (ORCPT ); Mon, 21 Nov 2016 18:42:42 -0500 Received: from mail-pg0-f50.google.com ([74.125.83.50]:36488 "EHLO mail-pg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752927AbcKUXmk (ORCPT ); Mon, 21 Nov 2016 18:42:40 -0500 From: Kevin Hilman To: Neil Armstrong Cc: carlo@caione.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Subject: Re: [PATCH 1/2] ARM64: dts: Add support for Meson GXM Organization: BayLibre References: <20161121162905.14285-1-narmstrong@baylibre.com> <20161121162905.14285-2-narmstrong@baylibre.com> Date: Mon, 21 Nov 2016 15:42:38 -0800 In-Reply-To: <20161121162905.14285-2-narmstrong@baylibre.com> (Neil Armstrong's message of "Mon, 21 Nov 2016 17:29:04 +0100") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (darwin) MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Neil, Neil Armstrong writes: > Following the Amlogic Linux kernel, it seem the only differences > between the GXL and GXM SoCs are the CPU Clusters. > > This commit renames the gxl-s905d-p23x DTSI in a common file for > S905D p20x and S912 q20x boards. s/p20x/p23x/ ?? > Then adds a meson-gxm dtsi and reproduce the P23x to Q20x boards > dts files since the S905D and S912 SoCs shares the same pinout > and the P23x and Q20x boards are identical. > > Signed-off-by: Neil Armstrong I had to drop this as it breaks the network on (at least) gxbb-p200, but... [...] > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts > index 03e3d76..17bb77c 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts > +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts > @@ -56,3 +56,22 @@ > pinctrl-0 = <&i2c_b_pins>; > pinctrl-names = "default"; > }; > + > +ðmac { > + status = "okay"; > + pinctrl-0 = <ð_rgmii_pins>; > + pinctrl-names = "default"; > + > + phy-handle = <ð_phy0>; > + > + mdio { > + compatible = "snps,dwmac-mdio"; > + #address-cells = <1>; > + #size-cells = <0>; > + > + eth_phy0: ethernet-phy@0 { > + reg = <0>; > + realtek,disable-eee-1000t; > + }; > + }; > +}; ... backing out this change makes it work again. This change also looks suspicious as it's using the proposed disable-eee properties, which I don't think have been merged yet. > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts > index 39bb037..5608c51 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts > +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts > @@ -50,3 +50,10 @@ > compatible = "amlogic,p201", "amlogic,meson-gxbb"; > model = "Amlogic Meson GXBB P201 Development Board"; > }; > + > +ðmac { > + status = "okay"; > + pinctrl-0 = <ð_rmii_pins>; > + pinctrl-names = "default"; > + phy-mode = "rmii"; > +}; This also doesn't look releveant to the GXL/GXM changes being introduced in this patch. Could you separate out any GXBB-related changes into a separate patch (if they are in fact needed) and re-spin this? Thanks, Kevin