From:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     Maxim Kiselev <bigunclemax@gmail.com>
CC:     "andrew@lunn.ch" <andrew@lunn.ch>,
        "benh@kernel.crashing.org" <benh@kernel.crashing.org>,
        "davem@davemloft.net" <davem@davemloft.net>,
        "devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
        "fido_max@inbox.ru" <fido_max@inbox.ru>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>,
        "mpe@ellerman.id.au" <mpe@ellerman.id.au>,
        "paulus@samba.org" <paulus@samba.org>,
        "robh+dt@kernel.org" <robh+dt@kernel.org>
Subject: Re: [PATCH] powerpc: dts: add device tree for T1040RDB-REV-A
Thread-Topic: [PATCH] powerpc: dts: add device tree for T1040RDB-REV-A
Thread-Index: AQHYBv8LPgYCyvCS1UKB/8/tYVavPKxd8iOA
Date:   Tue, 11 Jan 2022 15:29:47 +0000
Message-ID: <20220111152947.6zvt7j7366wsg6o2@skbuf>
References: <20220111131355.djuyn6bbirqtsama@skbuf>
 <20220111152204.3524442-1-bigunclemax@gmail.com>
In-Reply-To: <20220111152204.3524442-1-bigunclemax@gmail.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?Ji0mnNzsho3CC2wcl7OxNTiYLWSnkFmIKX/Lc4+G2qMESnjuAKfDUkMTXJYe?=
 =?us-ascii?Q?pXmx/nJh8eRdtj7lSNeySc/HmLCdO8Cy0AvuGWBel4M8utfjYaRfxoTX24qs?=
 =?us-ascii?Q?ERM6UebxcLKOzdElmm9UWprW0ZlJUR1BFV5fwC/Hnroklkf2WFNRpweQ4L9C?=
 =?us-ascii?Q?GBXjKgXRw9b6uqugI0Vh10wr8oxl7+FM9YD3fLo53KmDfF5kibmYoy5tq56I?=
 =?us-ascii?Q?KDY0uwd+XtqqdiOVCDXKGdJakBRN5/ByCKGS4tCJWExCt04Wd9wbNCKTVJWA?=
 =?us-ascii?Q?Az4paffYm2kjVppHyX9nMo7iWw0wmYaBBpswUsHSbRUi8wgCAbKIajNXswIT?=
 =?us-ascii?Q?bPYXRGDkDaAiLtSKY7aXA2+HiesA6dRY2oNB9sq8XJ00p6b1UneoKZOM2cNW?=
 =?us-ascii?Q?GNPiiB5OFBazzg+FEhlcQiC6TJyF+MzW5zmllH8HxBvQs6msQQlr1iTkyREo?=
 =?us-ascii?Q?HGtpdEOU6rMfkc+owzcHxhIMmQqlA6x8STLUK09n4dBxmo3kKMS9KArp31re?=
 =?us-ascii?Q?41hJDlTtFZs6H7C3fZMY9C2nODbMviDs5Nlxdgi6MKszPaw7fcoxW4tXtEMc?=
 =?us-ascii?Q?AsqtMfg5VZpLJ10287nw85+gWJ1l4HBFQBF/NxbesOeZ9nzZzboBpGMu5iOA?=
 =?us-ascii?Q?9zEFTuTGAPZX2Y0imtZ1vp23J/16tUCSiQDLfoh8lsZZ+A8s6qU3ac3BA5Un?=
 =?us-ascii?Q?1HK/hVKZoN6vqbMYh8oEmXQVrYl0SdA9POQppeOSDngdP1hKsdU6MYVCF2AM?=
 =?us-ascii?Q?gKGqgawpJ8bD1owgTx3+x/xJlXo/BO8YSvML5ojgceq0/oKkL9qPXikXWMAU?=
 =?us-ascii?Q?Ollb5UmbQGKbiNVcCWaePXmANNShQxRzgk5GNBxOFnP9B9tlWFf3AQHhx36u?=
 =?us-ascii?Q?Ps5jffeFldh5J0EygxwE31zQTVKgMk6/JVjsnfpstiyCUc9sG9dHTFuMwu/w?=
 =?us-ascii?Q?aGvJG0G+NFT/wCp71kcQR2+41ZTzmGKGx/2n2/RQWLiPbN4EZG6vbEjmk8Qd?=
 =?us-ascii?Q?4RoBuHIMah7NfyQ/GdS0WYpFckiuGBlMQFfqZqVHTWCb1992PBauvxoA8jcR?=
 =?us-ascii?Q?VtBt0tnBCyIUVz8buPy3d//K0EYDxGjHf4NJUIsjkQec9fj9vpUGzaqX03ec?=
 =?us-ascii?Q?9jgWQIh4Wc2d94jvskYGop4o7Y4svx9MBgDRtJhNR3AvyCJU/S4t+hVZ0jl+?=
 =?us-ascii?Q?UjJ4xvkamf2h7q5nWfSyDhXnwHITNXkUGP7nVTp6Kc/kgAlTnAPXwLbzRXYt?=
 =?us-ascii?Q?hQKAQ2tHrEnp7kj8g0Rn3lOnJqc/67t1j/clJjIbfdyFqCTHAFbtulrVhziO?=
 =?us-ascii?Q?RG2ZoaVQazRn6iwHmDw8Vy4KqxdVrxZPLgUxBAsgenZu7jSoKxPV3xohRV9w?=
 =?us-ascii?Q?ti83R1BAHzPW4mVuifX2t1Vu1vMoQh7n2fVeUBfpKTNd1T0DMx91OArOrwrK?=
 =?us-ascii?Q?m6Es212U+kSP2NhME+pYagu+11lz6IUBG1iCBz1szylOAcSNlMWqBezrKLIL?=
 =?us-ascii?Q?YrxN6cjUM4Dlw3SMakgEopP7vi/yXNutXNtA8HfK6uTgN6+aLerW5qRNmn5M?=
 =?us-ascii?Q?7aYfihbAgKnlnbT7aJkovnU5YDmT+/y56MlKhuz4ykr62Tr9ptcvUB+Fhr0y?=
 =?us-ascii?Q?gX4S8Fj0/SQWlA0d/1vOsYs=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <A494E902CB82CA4E8304ED21413EC020@eurprd04.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: cb93121a-d58b-481b-1bb3-08d9d51733dd
X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Jan 2022 15:29:47.9322
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: VLi46ibNpDbzYV8pc/xOyFkOUqmbIpaBEy4IuHx5NrhnqGX+O1kPzprusNstdCPWxVFI3wObV59ORX7sh/L2dQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2512
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Maxim,

On Tue, Jan 11, 2022 at 06:22:04PM +0300, Maxim Kiselev wrote:
> On board rev A, the network interface labels for the switch ports
> written on the front panel are different than on rev B and later.
>=20
> This patch introduces a separate device tree for rev A.
> The main device tree is supposed to cover rev B and later.
>=20
> Signed-off-by: Maxim Kiselev <bigunclemax@gmail.com>
> ---
>  arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts | 185 +++++++++++++++++++
>  1 file changed, 185 insertions(+)
>  create mode 100644 arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts
>=20
> diff --git a/arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts b/arch/powerpc/=
boot/dts/fsl/t1040rdb-rev-a.dts
> new file mode 100644
> index 0000000000000..f74486ba1d45f
> --- /dev/null
> +++ b/arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts
> @@ -0,0 +1,185 @@
> +/*
> + * T1040RDB Device Tree Source
> + *
> + * Copyright 2014 - 2015 Freescale Semiconductor Inc.
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions ar=
e met:
> + *     * Redistributions of source code must retain the above copyright
> + *	 notice, this list of conditions and the following disclaimer.
> + *     * Redistributions in binary form must reproduce the above copyrig=
ht
> + *	 notice, this list of conditions and the following disclaimer in the
> + *	 documentation and/or other materials provided with the distribution.
> + *     * Neither the name of Freescale Semiconductor nor the
> + *	 names of its contributors may be used to endorse or promote products
> + *	 derived from this software without specific prior written permission=
.
> + *
> + *
> + * ALTERNATIVELY, this software may be distributed under the terms of th=
e
> + * GNU General Public License ("GPL") as published by the Free Software
> + * Foundation, either version 2 of that License or (at your option) any
> + * later version.
> + *
> + * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor "AS IS" AND ANY
> + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMP=
LIED
> + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AR=
E
> + * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR A=
NY
> + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DA=
MAGES
> + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SE=
RVICES;
> + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUS=
ED AND
> + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR=
 TORT
> + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE=
 OF THIS
> + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> + */
> +
> +/include/ "t104xsi-pre.dtsi"
> +/include/ "t104xrdb.dtsi"
> +
> +/ {
> +	model =3D "fsl,T1040RDB-REV-A";
> +	compatible =3D "fsl,T1040RDB-REV-A";
> +
> +	aliases {
> +		phy_sgmii_2 =3D &phy_sgmii_2;
> +	};
> +
> +	soc@ffe000000 {
> +		fman@400000 {
> +			ethernet@e0000 {
> +				fixed-link =3D <0 1 1000 0 0>;
> +				phy-connection-type =3D "sgmii";
> +			};
> +
> +			ethernet@e2000 {
> +				fixed-link =3D <1 1 1000 0 0>;
> +				phy-connection-type =3D "sgmii";
> +			};
> +
> +			ethernet@e4000 {
> +				phy-handle =3D <&phy_sgmii_2>;
> +				phy-connection-type =3D "sgmii";
> +			};
> +
> +			mdio@fc000 {
> +				phy_sgmii_2: ethernet-phy@3 {
> +					reg =3D <0x03>;
> +				};
> +
> +				/* VSC8514 QSGMII PHY */
> +				phy_qsgmii_0: ethernet-phy@4 {
> +					reg =3D <0x4>;
> +				};
> +
> +				phy_qsgmii_1: ethernet-phy@5 {
> +					reg =3D <0x5>;
> +				};
> +
> +				phy_qsgmii_2: ethernet-phy@6 {
> +					reg =3D <0x6>;
> +				};
> +
> +				phy_qsgmii_3: ethernet-phy@7 {
> +					reg =3D <0x7>;
> +				};
> +
> +				/* VSC8514 QSGMII PHY */
> +				phy_qsgmii_4: ethernet-phy@8 {
> +					reg =3D <0x8>;
> +				};
> +
> +				phy_qsgmii_5: ethernet-phy@9 {
> +					reg =3D <0x9>;
> +				};
> +
> +				phy_qsgmii_6: ethernet-phy@a {
> +					reg =3D <0xa>;
> +				};
> +
> +				phy_qsgmii_7: ethernet-phy@b {
> +					reg =3D <0xb>;
> +				};
> +			};
> +		};
> +	};
> +
> +	ifc: localbus@ffe124000 {
> +		cpld@3,0 {
> +			compatible =3D "fsl,t1040rdb-cpld";
> +		};
> +	};
> +};
> +
> +#include "t1040si-post.dtsi"
> +
> +&seville_switch {
> +	status =3D "okay";
> +};
> +
> +&seville_port0 {
> +	managed =3D "in-band-status";
> +	phy-handle =3D <&phy_qsgmii_0>;
> +	phy-mode =3D "qsgmii";
> +	label =3D "ETH5";
> +	status =3D "okay";
> +};
> +
> +&seville_port1 {
> +	managed =3D "in-band-status";
> +	phy-handle =3D <&phy_qsgmii_1>;
> +	phy-mode =3D "qsgmii";
> +	label =3D "ETH4";
> +	status =3D "okay";
> +};
> +
> +&seville_port2 {
> +	managed =3D "in-band-status";
> +	phy-handle =3D <&phy_qsgmii_2>;
> +	phy-mode =3D "qsgmii";
> +	label =3D "ETH7";
> +	status =3D "okay";
> +};
> +
> +&seville_port3 {
> +	managed =3D "in-band-status";
> +	phy-handle =3D <&phy_qsgmii_3>;
> +	phy-mode =3D "qsgmii";
> +	label =3D "ETH6";
> +	status =3D "okay";
> +};
> +
> +&seville_port4 {
> +	managed =3D "in-band-status";
> +	phy-handle =3D <&phy_qsgmii_4>;
> +	phy-mode =3D "qsgmii";
> +	label =3D "ETH9";
> +	status =3D "okay";
> +};
> +
> +&seville_port5 {
> +	managed =3D "in-band-status";
> +	phy-handle =3D <&phy_qsgmii_5>;
> +	phy-mode =3D "qsgmii";
> +	label =3D "ETH8";
> +	status =3D "okay";
> +};
> +
> +&seville_port6 {
> +	managed =3D "in-band-status";
> +	phy-handle =3D <&phy_qsgmii_6>;
> +	phy-mode =3D "qsgmii";
> +	label =3D "ETH11";
> +	status =3D "okay";
> +};
> +
> +&seville_port7 {
> +	managed =3D "in-band-status";
> +	phy-handle =3D <&phy_qsgmii_7>;
> +	phy-mode =3D "qsgmii";
> +	label =3D "ETH10";
> +	status =3D "okay";
> +};
> +
> +&seville_port8 {
> +	ethernet =3D <&enet0>;
> +	status =3D "okay";
> +};
> --=20
> 2.32.0
>

This is pretty much not the patch I was expecting to see.
I was expecting to see arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts
containing only this:

/include/ t1040rdb.dts

/ {
	model =3D "fsl,T1040RDB-REV-A";
	compatible =3D "fsl,T1040RDB-REV-A";
};

&seville_port0 {
	label =3D "ETH5";
};

&seville_port2 {
	label =3D "ETH7";
};

&seville_port4 {
	label =3D "ETH9";
};

&seville_port6 {
	label =3D "ETH11";
};

Also, I don't see the changes from your original patch applied to the
main t1040rdb.dts. Did you forget to include them?=