From patchwork Thu May 7 21:12:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darren Stevens X-Patchwork-Id: 1285629 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49J6KJ1QhPz9sSG for ; Fri, 8 May 2020 07:38:44 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=stevens-zone.net Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 49J6KH6xd5zDqwB for ; Fri, 8 May 2020 07:38:43 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=stevens-zone.net (client-ip=212.227.126.135; helo=mout.kundenserver.de; envelope-from=darren@stevens-zone.net; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=stevens-zone.net Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.135]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 49J6Bs18vVzDqj4 for ; Fri, 8 May 2020 07:33:07 +1000 (AEST) Received: from Cyrus.lan ([80.189.87.220]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.163]) with ESMTPA (Nemesis) id 1MTAJr-1jhPoE2dBv-00UYN8; Thu, 07 May 2020 23:32:57 +0200 Date: Thu, 7 May 2020 22:12:30 +0100 From: Darren Stevens To: linuxppc-dev@lists.ozlabs.org, oss@buserror.net Subject: [PATCH 1/5] powerpc/mpc85xx: Define ethernet port aliases in board dts file Message-ID: <20200507221230.7950125c@Cyrus.lan> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; powerpc-unknown-linux-gnu) MIME-Version: 1.0 X-Provags-ID: V03:K1:4QH9YlspBVO89hg+QRiyYoQRIdhdf9JSyjF2xKgqrdjzXDVLWlo e22GRec3iSrQyaCiS6k4aC48nF3AKEn6PxBv+0n9gVcUpRpRDenbNwV5DBnbU61zuvX3Ir/ fX2gDdNtSPmAPE0vgGs2eRujTtg9jYQgEOQw2iTuilcVlIAlPjkRaV06oYWt9itbWuncRuF bCE7RkM1AWwjDF0HGwRGg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:frMB1f22umM=:INPabHWjk0mL2dLfcXl4Km tbg0NUsEfegDtCuyfp+lujLfEsd5WyvfHndICvWPT0k2whP9lEUwG9169USV40ndwtDxHrjKe o6ETU32ZieUfO6g3JIggFLt23C27qieVDwcDK/zit5LFDeGEuVdRZ899+usJsMim+VkbrAjd4 x70oE9Nhif7LhzGFfde5KmNA49YDhI+wMFfWuMjWVdut47/XQyd80gqVfc6qxlv7NmSM6VBMb JG9ygJKNSRrMoqQr98gZPtF2T5alr4nqH5oDS5xTujRCkvV23l8ND5hOaMtjRehurPa5GaCHs H2AEB+gk5ac4OH97TXwg8CrlkS/WEM87ExzdugdLeYEB8XUcueBd8js9SGdFjd3ut7mQmfVrD QqgG8448k+h4IDWcApVpE3U5lWxGWhjg4KHtGvTjMImCxxuO2WI45un4NzP1NF+48EoOuUarX HF7Xn/pme3cASIWwcFy0wjQzOPPSmb6Mm9Ei5gyb5i5C9Q3W9TvLr5WRyqqGb7ROdQnJdc1Vn fcdxcA5TeDJZn/MKbzUDFn1Cb0efQPv7TNqWbRP+1NtjlKHDmtVks1SwFwGjysqhAZYqnGFjV tfiHI/oHHnyy8tSLnfW5PMijCk+bhy4zMND64mEjO/RpwmaEN5s07d3w8cvTxXHRfUhQSNoys O5khGXhLF8rTY5iV6DVO7naAREodLuEeT/ojhUTzr5Ns668ir2MjLUD3IwBloLZaUcOPP4o6R Y5hII/wMfqSTXne4CnSppF/t9Y4t/l65eHQ26uAvqFg11JdIqScTDS2jNtZyA0ZjdyF4edNNX mWuvBoxpFXKhXC8TaCZfhjQIOHX0BfVKIXm599637eHC2zbRFP3JGapsCx1sE2UAFX94Ny7 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: chzigotzky@xenosoft.de Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" in patch da414bb923d9 (Add FSL Qoriq DPAA FMan support to the SoC device tree(s)) we added aliases for all ethernet ports, and linked them to specific hardware devices, but we put them in the pre.dtsi include file meaning any board wishing to use this file is stuck with this port layout, even if it don't match the boards hardware. The Cyrus 5020 and 5040 boards are examples, they are based on the p5020 ref design, but only have 2 ethernet ports. Fix the problem by moving the ethernet aliases to the boards dts file where we define the phy aliases. Signed-off-by: Darren Stevens --- Only patched the p5020ds and p5040ds as they are the boards I work with. Others may need looking at. arch/powerpc/boot/dts/fsl/p5020ds.dts | 7 +++++++ arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi | 6 ------ arch/powerpc/boot/dts/fsl/p5040ds.dts | 13 +++++++++++++ arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi | 12 ------------ 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi index ed89dbb..bc4e0bc 100644 --- a/arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi +++ b/arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi @@ -81,18 +81,6 @@ fman0 = &fman0; fman1 = &fman1; - ethernet0 = &enet0; - ethernet1 = &enet1; - ethernet2 = &enet2; - ethernet3 = &enet3; - ethernet4 = &enet4; - ethernet5 = &enet5; - ethernet6 = &enet6; - ethernet7 = &enet7; - ethernet8 = &enet8; - ethernet9 = &enet9; - ethernet10 = &enet10; - ethernet11 = &enet11; }; cpus { diff --git a/arch/powerpc/boot/dts/fsl/p5020ds.dts b/arch/powerpc/boot/dts/fsl/p5020ds.dts index b24adf9..cdf0559 100644 --- a/arch/powerpc/boot/dts/fsl/p5020ds.dts +++ b/arch/powerpc/boot/dts/fsl/p5020ds.dts @@ -53,6 +53,13 @@ emi1_rgmii = &hydra_mdio_rgmii; emi1_sgmii = &hydra_mdio_sgmii; emi2_xgmii = &hydra_mdio_xgmii; + + ethernet0 = &enet0; + ethernet1 = &enet1; + ethernet2 = &enet2; + ethernet3 = &enet3; + ethernet4 = &enet4; + ethernet5 = &enet5; }; memory { diff --git a/arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi index 2d74ea8..8bc7a75 100644 --- a/arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi +++ b/arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi @@ -81,12 +81,6 @@ raideng_jr3 = &raideng_jr3; fman0 = &fman0; - ethernet0 = &enet0; - ethernet1 = &enet1; - ethernet2 = &enet2; - ethernet3 = &enet3; - ethernet4 = &enet4; - ethernet5 = &enet5; }; cpus { diff --git a/arch/powerpc/boot/dts/fsl/p5040ds.dts b/arch/powerpc/boot/dts/fsl/p5040ds.dts index 30850b3..bffbba5 100644 --- a/arch/powerpc/boot/dts/fsl/p5040ds.dts +++ b/arch/powerpc/boot/dts/fsl/p5040ds.dts @@ -65,6 +65,19 @@ hydra_sg_slot6 = &hydra_sg_slot6; hydra_xg_slot1 = &hydra_xg_slot1; hydra_xg_slot2 = &hydra_xg_slot2; + + ethernet0 = &enet0; + ethernet1 = &enet1; + ethernet2 = &enet2; + ethernet3 = &enet3; + ethernet4 = &enet4; + ethernet5 = &enet5; + ethernet6 = &enet6; + ethernet7 = &enet7; + ethernet8 = &enet8; + ethernet9 = &enet9; + ethernet10 = &enet10; + ethernet11 = &enet11; }; memory { From patchwork Thu May 7 21:30:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darren Stevens X-Patchwork-Id: 1285630 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49J6MG2Mc7z9sRY for ; Fri, 8 May 2020 07:40:26 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=stevens-zone.net Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 49J6MG1kF9zDqv8 for ; Fri, 8 May 2020 07:40:26 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=stevens-zone.net (client-ip=212.227.126.187; helo=mout.kundenserver.de; envelope-from=darren@stevens-zone.net; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=stevens-zone.net Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.187]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 49J6Bs15xdzDqgS for ; Fri, 8 May 2020 07:33:07 +1000 (AEST) Received: from Cyrus.lan ([80.189.87.220]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.163]) with ESMTPA (Nemesis) id 1MmDAW-1iougF0Pse-00iDsL; Thu, 07 May 2020 23:32:59 +0200 Date: Thu, 7 May 2020 22:30:25 +0100 From: Darren Stevens To: linuxppc-dev@lists.ozlabs.org, oss@buserror.net Subject: [PATCH 5/5] powerpc/mpc85xx: Add Cyrus P5040 device tree source Message-ID: <20200507223025.0164b95b@Cyrus.lan> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; powerpc-unknown-linux-gnu) MIME-Version: 1.0 X-Provags-ID: V03:K1:GXtaYXOv1B/RabyQVXjZJBu5bQ20FowCrgPra/IS9+5pbXQc/PL uqwfn8dmizwenabUpWtaalXHPlMPLNr5DTjE2uDdvMLxLbdC+talbh7DxLumj7p1rhWG96e i8GwILazlCcoe5Dr0x0DoevdbqWX9kxB6VOlNz4wwSXcspChosPljkcpoqM2XrNroT13fxI ylpRLQACRSDeUu/Ph5rkw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:Os9PIwNHjRI=:SHyTx+5XYS3Ja7uDgZo3sb j5fDwx9HvvJQkesq0JX2yNFIfA8mPkk4RC3nd73uOPl0b7YEsAM+VFjStc1YCUIaQk17kzSE6 Tocpbf9ZVa7HdazF8ovbDu6Y6LICAmpJANioN6GXibVoz/OyW8ZF/ojfS/Wue5A733GV0ACpi XnIfm5NOacQdYV71tVy2qKnVaTACzrJPzgaNO+keqUQuxFCY4aUYBMwtkJGL/RfD6Ym9VVucC 3pi5UTJcbD+nPqC/Orz3KaEa8hqep/OaE0Q6B82KHGew0D9L61ysHafsWUE0cvGRIbVpZgvMB 2/5eBPCN91oiOd/JbtzBloTxh4QjqZt+1SgVaQwmfEQS6Enk2FBKOXpsEVnVr4ha4aigSp5hh 6LKgdsj2Pb6TVLTjUPirvXFKGB49rK7hS5zRFEGhdB4rTUWV/2BNNhwleRYbODX4OKULrpgt8 8b7vAqc08bXd1uNeoeaNNuwd9wkX28iOcF4S7NxIHzJq5u11t+U8CdqYEKNDplIwWOtGok0A9 8CIf5g4/2ngt5q8fi9RojgeY+jbpVdEOATMzT0fIyn8Q6xSftVHU7aJJzVf0ya6A4c9RXW1/E 8ClNNcEYcy5fcscltmVqlcZQOC0S/INMDcZzdKz8FIJMiUn958ICrxx4Z+enD1bj2ZbUfVGob 4oApczP2iCqkBgm02BanM2JZsErHBV+VAw+assFCfLCI+lc+ldN5XGOCYkXZPu1kagSKxR6kT Kdn8q6ghGexwfbKWLzBah5bTGeF6E4eNog4JcvzwY5sx5A6vPTilMMEVXuIY6+KcPj9MqFpYY y2hNhfTeuFy01f6QycQioKBzYz/ZbmShT+zUAkbX2nWUadtAJqtSGJeG1fLWG77gnAM0HbK X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: chzigotzky@xenosoft.de Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" The Cyrus P5040 does not currently have a dts file in Linux, Add one. Signed-off-by: Darren Stevens Tested-by: Christian Zigotzky --- arch/powerpc/boot/dts/fsl/cyrus_p5040.dts | 235 ++++++++++++++++++++++++++++++ 1 file changed, 235 insertions(+) diff --git a/arch/powerpc/boot/dts/fsl/cyrus_p5040.dts b/arch/powerpc/boot/dts/fsl/cyrus_p5040.dts new file mode 100644 index 0000000..596ee19 --- /dev/null +++ b/arch/powerpc/boot/dts/fsl/cyrus_p5040.dts @@ -0,0 +1,235 @@ +/* + * Cyrus 5040 Device Tree Source, based on p5040ds.dts + * + * Copyright 2020 Darren Stevens + * + * p5040ds.dts Copyright 2012 - 2015 Freescale Semiconductor Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are 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 copyright + * 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 the + * 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 implied + * warranties of merchantability and fitness for a particular purpose are + * disclaimed. In no event shall Freescale Semiconductor be liable for any + * direct, indirect, incidental, special, exemplary, or consequential damages + * (including, but not limited to, procurement of substitute goods or services; + * loss of use, data, or profits; or business interruption) however caused 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/ "p5040si-pre.dtsi" + +/ { + model = "varisys,CYRUS5040"; + compatible = "varisys,CYRUS"; + #address-cells = <2>; + #size-cells = <2>; + interrupt-parent = <&mpic>; + + aliases{ + ethernet0 = &enet4; + ethernet1 = &enet10; + }; + + memory { + device_type = "memory"; + }; + + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + bman_fbpr: bman-fbpr { + size = <0 0x1000000>; + alignment = <0 0x1000000>; + }; + qman_fqd: qman-fqd { + size = <0 0x400000>; + alignment = <0 0x400000>; + }; + qman_pfdr: qman-pfdr { + size = <0 0x2000000>; + alignment = <0 0x2000000>; + }; + }; + + dcsr: dcsr@f00000000 { + ranges = <0x00000000 0xf 0x00000000 0x01008000>; + }; + + bportals: bman-portals@ff4000000 { + ranges = <0x0 0xf 0xf4000000 0x200000>; + }; + + qportals: qman-portals@ff4200000 { + ranges = <0x0 0xf 0xf4200000 0x200000>; + }; + + soc: soc@ffe000000 { + ranges = <0x00000000 0xf 0xfe000000 0x1000000>; + reg = <0xf 0xfe000000 0 0x00001000>; + spi@110000 { + }; + + i2c@118100 { + }; + + i2c@119100 { + rtc@6f { + compatible = "microchip,mcp7941x"; + reg = <0x6f>; + }; + }; + + gpio-poweroff { + compatible = "gpio-poweroff"; + gpios = <&gpio0 3 1>; + }; + + gpio-restart { + compatible = "gpio-restart"; + gpios = <&gpio0 2 1>; + }; + + leds { + compatible = "gpio-leds"; + hdd { + label = "Disk activity"; + gpios = <&gpio0 5 0>; + linux,default-trigger = "disk-activity"; + }; + }; + + fman@400000 { + mdio@e1120 { + phy3: ethernet-phy@3 { + reg = <0x3>; + }; + + phy7: ethernet-phy@7 { + reg = <0x7>; + }; + }; + + ethernet@e0000 { + status = "disabled"; + }; + + ethernet@e2000 { + status = "disabled"; + }; + + ethernet@e4000 { + status = "disabled"; + }; + + ethernet@e6000 { + status = "disabled"; + }; + + ethernet@e8000 { + phy-handle = <&phy3>; + phy-connection-type = "rgmii"; + }; + + }; + + fman@500000 { + ethernet@e0000 { + status = "disabled"; + }; + + ethernet@e2000 { + status = "disabled"; + }; + + ethernet@e4000 { + status = "disabled"; + }; + + ethernet@e6000 { + status = "disabled"; + }; + + ethernet@e8000 { + phy-handle = <&phy7>; + phy-connection-type = "rgmii"; + }; + + }; + + }; + + lbc: localbus@ffe124000 { + reg = <0xf 0xfe124000 0 0x1000>; + ranges = <0 0 0xf 0xe8000000 0x08000000 + 2 0 0xf 0xffa00000 0x00040000 + 3 0 0xf 0xffdf0000 0x00008000>; + + }; + + pci0: pcie@ffe200000 { + reg = <0xf 0xfe200000 0 0x1000>; + ranges = <0x02000000 0 0xe0000000 0xc 0x00000000 0x0 0x20000000 + 0x01000000 0 0x00000000 0xf 0xf8000000 0x0 0x00010000>; + pcie@0 { + ranges = <0x02000000 0 0xe0000000 + 0x02000000 0 0xe0000000 + 0 0x20000000 + + 0x01000000 0 0x00000000 + 0x01000000 0 0x00000000 + 0 0x00010000>; + }; + }; + + pci1: pcie@ffe201000 { + reg = <0xf 0xfe201000 0 0x1000>; + ranges = <0x02000000 0x0 0xe0000000 0xc 0x20000000 0x0 0x20000000 + 0x01000000 0x0 0x00000000 0xf 0xf8010000 0x0 0x00010000>; + pcie@0 { + ranges = <0x02000000 0 0xe0000000 + 0x02000000 0 0xe0000000 + 0 0x20000000 + + 0x01000000 0 0x00000000 + 0x01000000 0 0x00000000 + 0 0x00010000>; + }; + }; + + pci2: pcie@ffe202000 { + reg = <0xf 0xfe202000 0 0x1000>; + ranges = <0x02000000 0 0xe0000000 0xc 0x40000000 0 0x20000000 + 0x01000000 0 0x00000000 0xf 0xf8020000 0 0x00010000>; + pcie@0 { + ranges = <0x02000000 0 0xe0000000 + 0x02000000 0 0xe0000000 + 0 0x20000000 + + 0x01000000 0 0x00000000 + 0x01000000 0 0x00000000 + 0 0x00010000>; + }; + }; +}; + +/include/ "p5040si-post.dtsi"