[openwrt/openwrt] mpc85xx: p1010: use common DTSI for Watchguard Firebox T1X

LEDE Commits lede-commits at lists.infradead.org
Wed Dec 10 15:58:53 PST 2025


ansuel pushed a commit to openwrt/openwrt.git, branch openwrt-25.12:
https://git.openwrt.org/bb61b5b31d2a16d72d821e0d195495ab1aebb8d6

commit bb61b5b31d2a16d72d821e0d195495ab1aebb8d6
Author: Shine <4c.fce2 at proton.me>
AuthorDate: Thu Oct 24 18:17:43 2024 +0200

    mpc85xx: p1010: use common DTSI for Watchguard Firebox T1X
    
    In preparation of adding support for additional Watchguard Firebox devices
    based on Freescale P1010, introduce a common DTSI.
    
    Signed-off-by: Shine <4c.fce2 at proton.me>
    Link: https://github.com/openwrt/openwrt/pull/16776
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
    (cherry picked from commit 15ef024805f15fd1495f9cfa129a3e29d5b349ff)
---
 .../files/arch/powerpc/boot/dts/firebox-t10.dts    | 219 +--------------------
 .../boot/dts/{firebox-t10.dts => firebox-t1x.dtsi} |  90 +--------
 2 files changed, 6 insertions(+), 303 deletions(-)

diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/firebox-t10.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/firebox-t10.dts
index 7f6235ad35..a610d75f5e 100644
--- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/firebox-t10.dts
+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/firebox-t10.dts
@@ -1,229 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0-or-later or MIT
 
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-#include <dt-bindings/gpio/gpio.h>
-
 /include/ "fsl/p1010si-pre.dtsi"
+#include "firebox-t1x.dtsi"
 
 / {
 	model = "Watchguard Firebox T10";
 	compatible = "watchguard,firebox-t10";
 
-	chosen {
-		bootargs = "console=ttyS0,115200";
-		bootargs-override = "console=ttyS0,115200";
-	};
-
-	aliases {
-		spi0 = &spi0;
-		led-boot = &led_mode;
-		led-failsafe = &led_failover;
-		led-running = &led_mode;
-		led-upgrade = &led_attention;
-		/delete-property/ ethernet0;
-		/delete-property/ ethernet1;
-		/delete-property/ ethernet2;
-	};
-
-	memory {
-		device_type = "memory";
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_attention: attention_orange {
-			gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
-			label = "orange:attention";
-		};
-
-		status_red {
-			gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
-			function = LED_FUNCTION_STATUS;
-			color = <LED_COLOR_ID_RED>;
-		};
-
-		led_mode: mode_green {
-			gpios = <&gpio0 4 GPIO_ACTIVE_LOW>;
-			label = "green:mode";
-		};
-
-		led_failover: failover_green {
-			gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
-			label = "green:failover";
-		};
-	};
-
-	buttons {
-		compatible = "gpio-keys";
-
-		reset {
-			label = "Reset button";
-			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RESTART>;
-		};
-	};
-
-
-	soc: soc at ffe00000 {
-		ranges = <0x0 0x0 0xffe00000 0x100000>;
-
-		i2c at 3000 {
-			rtc at 30 {
-				compatible = "sii,s35390a";
-				reg = <0x30>;
-			};
-		};
-
-		spi0: spi at 7000 {
-			flash at 0 {
-				compatible = "jedec,spi-nor";
-				reg = <0>;
-				spi-max-frequency = <25000000>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					uboot: partition at 0 {
-						reg = <0x0 0x90000>;
-						label = "u-boot";
-						read-only;
-					};
-
-					partition at 90000 {
-						reg = <0x90000 0x10000>;
-						label = "u-boot-env";
-					};
-
-					partition at a0000 {
-						reg = <0xa0000 0x20000>;
-						label = "cfgxxx";
-						read-only;
-					};
-
-					partition at c0000 {
-						reg = <0xc0000 0x40000>;
-						label = "device_id";
-						read-only;
-
-						nvmem-layout {
-							compatible = "fixed-layout";
-							#address-cells = <1>;
-							#size-cells = <1>;
-
-							macaddr_device_id_1830: mac-address at 1830 {
-								compatible = "mac-base";
-								reg = <0x1830 0x11>;
-								#nvmem-cell-cells = <1>;
-							};
-
-							macaddr_device_id_1844: mac-address at 1844 {
-								compatible = "mac-base";
-								reg = <0x1844 0x11>;
-								#nvmem-cell-cells = <1>;
-							};
-
-							macaddr_device_id_1858: mac-address at 1858 {
-								compatible = "mac-base";
-								reg = <0x1858 0x11>;
-								#nvmem-cell-cells = <1>;
-							};
-						};
-					};
-				};
-			};
-		};
-
-		gpio0: gpio-controller at fc00 {
-		};
-
-		usb at 22000 {
-			phy_type = "utmi";
-			dr_mode = "host";
-		};
-
-		mdio at 24000 {
-			phy1: ethernet-phy at 1 {
-				reg = <0x1>;
-			};
-
-			phy2: ethernet-phy at 2 {
-				reg = <0x2>;
-			};
-
-			phy3: ethernet-phy at 3 {
-				reg = <0x3>;
-			};
-		};
-
-		mdio at 25000 {
-			tbi_phy1: tbi-phy at 11 {
-				reg = <0x11>;
-				device_type = "tbi-phy";
-			};
-		};
-
-		mdio at 26000 {
-			tbi_phy2: tbi-phy at 11 {
-				reg = <0x11>;
-				device_type = "tbi-phy";
-			};
-		};
-
-		enet0: ethernet at b0000 {
-			phy-handle = <&phy1>;
-			phy-connection-type = "rgmii-id";
-
-			nvmem-cells = <&macaddr_device_id_1830 0>;
-			nvmem-cell-names = "mac-address";
-		};
-
-		enet1: ethernet at b1000 {
-			tbi-handle = <&tbi_phy1>;
-			phy-handle = <&phy2>;
-			phy-connection-type = "sgmii";
-
-			nvmem-cells = <&macaddr_device_id_1844 0>;
-			nvmem-cell-names = "mac-address";
-		};
-
-		enet2: ethernet at b2000 {
-			tbi-handle = <&tbi_phy2>;
-			phy-handle = <&phy3>;
-			phy-connection-type = "sgmii";
-
-			nvmem-cells = <&macaddr_device_id_1858 0>;
-			nvmem-cell-names = "mac-address";
-		};
-
-		sdhc at 2e000 {
-			status = "disabled";
-		};
-
-		serial1: serial at 4600 {
-			status = "disabled";
-		};
-
-		can0: can at 1c000 {
-			status = "disabled";
-		};
-
-		can1: can at 1d000 {
-			status = "disabled";
-		};
-	};
-
-	pci0: pcie at ffe09000 {
-		status = "disabled";
-	};
-
-	pci1: pcie at ffe0a000 {
-		status = "disabled";
-	};
-
 	ifc: ifc at ffe1e000 {
 		reg = <0x0 0xffe1e000 0 0x2000>;
 
diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/firebox-t10.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/firebox-t1x.dtsi
similarity index 66%
copy from target/linux/mpc85xx/files/arch/powerpc/boot/dts/firebox-t10.dts
copy to target/linux/mpc85xx/files/arch/powerpc/boot/dts/firebox-t1x.dtsi
index 7f6235ad35..09824b46cb 100644
--- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/firebox-t10.dts
+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/firebox-t1x.dtsi
@@ -4,12 +4,7 @@
 #include <dt-bindings/leds/common.h>
 #include <dt-bindings/gpio/gpio.h>
 
-/include/ "fsl/p1010si-pre.dtsi"
-
 / {
-	model = "Watchguard Firebox T10";
-	compatible = "watchguard,firebox-t10";
-
 	chosen {
 		bootargs = "console=ttyS0,115200";
 		bootargs-override = "console=ttyS0,115200";
@@ -131,6 +126,11 @@
 								reg = <0x1858 0x11>;
 								#nvmem-cell-cells = <1>;
 							};
+							macaddr_device_id_186c: mac-address at 186c {
+								compatible = "mac-base";
+								reg = <0x186c 0x11>;
+								#nvmem-cell-cells = <1>;
+							};
 						};
 					};
 				};
@@ -223,84 +223,4 @@
 	pci1: pcie at ffe0a000 {
 		status = "disabled";
 	};
-
-	ifc: ifc at ffe1e000 {
-		reg = <0x0 0xffe1e000 0 0x2000>;
-
-		/* NOR, NAND Flashes and CPLD on board */
-		ranges = <0x0 0x0 0x0 0xee000000 0x02000000
-			0x1 0x0 0x0 0xff800000 0x00010000
-			0x3 0x0 0x0 0xffb00000 0x00000020>;
-
-		nand at 100000000 {
-			compatible = "fsl,ifc-nand";
-			reg = <0x1 0x0 0x10000>;
-
-			partitions {
-				compatible = "fixed-partitions";
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				/*
-				 * Original partition layout:
-				 * 0x000000000000-0x000000020000 : "NAND (RW) WG DTB Image"
-				 * 0x000000020000-0x000000520000 : "NAND (RW) WG SYSA Kernel"
-				 * 0x000000520000-0x000007f00000 : "NAND (RW) WG SYSA_CODE"
-				 * 0x000007f00000-0x000008400000 : "NAND (RW) WG SYSB Kernel"
-				 * 0x000008400000-0x000009c00000 : "NAND (RW) WG SYSB_CODE"
-				 * 0x000009c00000-0x00000a100000 : "NAND (RW) WG SYSA2 Kernel"
-				 * 0x00000a100000-0x000011ae0000 : "NAND (RW) WG SYSA_CODE2"
-				 * 0x000011ae0000-0x000020000000 : "NAND (RW) WG SYSA_DATA"
-				 */
-
-				partition at 0 {
-					reg = <0x0 0x20000>;
-					label = "wg-dtb";
-					read-only;
-				};
-
-				partition at 20000 {
-					reg = <0x20000 0x500000>;
-					label = "kernel";
-				};
-
-				partition at 520000 {
-					reg = <0x520000 0x79e0000>;
-					label = "wg-sysa-rootfs";
-					read-only;
-				};
-
-				partition at 7f00000 {
-					reg = <0x7f00000 0x500000>;
-					label = "wg-sysb-kernel";
-					read-only;
-				};
-
-				partition at 8400000 {
-					reg = <0x8400000 0x1800000>;
-					label = "wg-sysb-rootfs";
-					read-only;
-				};
-
-				partition at 9c00000 {
-					reg = <0x9c00000 0x500000>;
-					label = "wg-sysa2-kernel";
-					read-only;
-				};
-
-				partition at a100000 {
-					reg = <0xa100000 0x79e0000>;
-					label = "wg-sysa2-rootfs";
-					read-only;
-				};
-
-				partition at 11ae0000 {
-					reg = <0x11ae0000 0xe520000>;
-					label = "ubi";
-				};
-			};
-		};
-	};
 };
-
-/include/ "fsl/p1010si-post.dtsi"




More information about the lede-commits mailing list