arm: dts: ten64: syncronise device tree with Linux

This synchronises the Linux device tree with U-Boot
(cp linux/..../fsl-ls1088a-ten64.dts uboot/..../fsl-ls1088a-ten64.dts),
as of Linux v6.2-rc5.

Missing from the U-Boot copy previously was the
Ethernet PCS definitions (required for linking with PHY in
Linux but not used by U-Boot) and various upstream
fixes and formatting changes.

The board microcontroller (which doesn't have a Linux driver)
has been moved to the -u-boot.dtsi, as well as the
spi0 quadspi alias (used by U-boot 'sf' but not valid for Linux).

Signed-off-by: Mathew McBride <matt@traverse.com.au>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Tested-by: Ioana Ciornei <ioana.ciornei@nxp.com> # on LS1088A-RDB

diff --git a/arch/arm/dts/fsl-ls1088a-ten64-u-boot.dtsi b/arch/arm/dts/fsl-ls1088a-ten64-u-boot.dtsi
index 298adb849b334c59149d8031e8429165cdbdfaa2..89566bf84935bb007efb0672a9d99965865acf3a 100644 (file)
--- a/arch/arm/dts/fsl-ls1088a-ten64-u-boot.dtsi
+++ b/arch/arm/dts/fsl-ls1088a-ten64-u-boot.dtsi
@@ -3,3 +3,16 @@
 
 #include "fsl-ls1088a-u-boot.dtsi"
 
+/{
+       aliases {
+               spi0 = &qspi;
+       };
+};
+
+&i2c0 {
+       uc: board-controller@7e {
+               compatible = "traverse,ten64-controller";
+               reg = <0x7e>;
+       };
+};
+

diff --git a/arch/arm/dts/fsl-ls1088a-ten64.dts b/arch/arm/dts/fsl-ls1088a-ten64.dts
index 55a7d41fb01b12f55c3ab3d8d10b23ace6fdf9df..d4867d6cf47cdc79a8a8ebf507b96e7e0683717d 100644 (file)
--- a/arch/arm/dts/fsl-ls1088a-ten64.dts
+++ b/arch/arm/dts/fsl-ls1088a-ten64.dts
@@ -22,7 +22,6 @@
        aliases {
                serial0 = &duart0;
                serial1 = &duart1;
-               spi0 = &qspi;
        };
 
        chosen {
@@ -36,18 +35,16 @@
                 * external power off (e.g ATX Power Button)
                 * asserted
                 */
-               powerdn {
+               button-powerdn {
                        label = "External Power Down";
                        gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
-                       interrupts = <&gpio1 17 IRQ_TYPE_EDGE_FALLING>;
                        linux,code = <KEY_POWER>;
                };
 
                /* Rear Panel 'ADMIN' button (GPIO_H) */
-               admin {
+               button-admin {
                        label = "ADMIN button";
                        gpios = <&gpio3 8 GPIO_ACTIVE_HIGH>;
-                       interrupts = <&gpio3 8 IRQ_TYPE_EDGE_RISING>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
        };
@@ -55,17 +52,17 @@
        leds {
                compatible = "gpio-leds";
 
-               sfp1down {
+               led-0 {
                        label = "ten64:green:sfp1:down";
                        gpios = <&gpio3 11 GPIO_ACTIVE_HIGH>;
                };
 
-               sfp2up {
+               led-1 {
                        label = "ten64:green:sfp2:up";
                        gpios = <&gpio3 12 GPIO_ACTIVE_HIGH>;
                };
 
-               admin {
+               led-2 {
                        label = "ten64:admin";
                        gpios = <&sfpgpio 12 GPIO_ACTIVE_HIGH>;
                };
@@ -95,17 +92,17 @@
 /* XG1 - Upper SFP */
 &dpmac1 {
        sfp = <&sfp_xg1>;
+       pcs-handle = <&pcs1>;
        phy-connection-type = "10gbase-r";
        managed = "in-band-status";
-       status = "okay";
 };
 
 /* XG0 - Lower SFP */
 &dpmac2 {
        sfp = <&sfp_xg0>;
+       pcs-handle = <&pcs2>;
        phy-connection-type = "10gbase-r";
        managed = "in-band-status";
-       status = "okay";
 };
 
 /* DPMAC3..6 is GE4 to GE8 */
@@ -113,28 +110,28 @@
        phy-handle = <&mdio1_phy5>;
        phy-connection-type = "qsgmii";
        managed = "in-band-status";
-       status = "okay";
+       pcs-handle = <&pcs3_0>;
 };
 
 &dpmac4 {
        phy-handle = <&mdio1_phy6>;
        phy-connection-type = "qsgmii";
        managed = "in-band-status";
-       status = "okay";
+       pcs-handle = <&pcs3_1>;
 };
 
 &dpmac5 {
        phy-handle = <&mdio1_phy7>;
        phy-connection-type = "qsgmii";
        managed = "in-band-status";
-       status = "okay";
+       pcs-handle = <&pcs3_2>;
 };
 
 &dpmac6 {
        phy-handle = <&mdio1_phy8>;
        phy-connection-type = "qsgmii";
        managed = "in-band-status";
-       status = "okay";
+       pcs-handle = <&pcs3_3>;
 };
 
 /* DPMAC7..10 is GE0 to GE3 */
@@ -142,28 +139,28 @@
        phy-handle = <&mdio1_phy1>;
        phy-connection-type = "qsgmii";
        managed = "in-band-status";
-       status = "okay";
+       pcs-handle = <&pcs7_0>;
 };
 
 &dpmac8 {
        phy-handle = <&mdio1_phy2>;
        phy-connection-type = "qsgmii";
        managed = "in-band-status";
-       status = "okay";
+       pcs-handle = <&pcs7_1>;
 };
 
 &dpmac9 {
        phy-handle = <&mdio1_phy3>;
        phy-connection-type = "qsgmii";
        managed = "in-band-status";
-       status = "okay";
+       pcs-handle = <&pcs7_2>;
 };
 
 &dpmac10 {
        phy-handle = <&mdio1_phy4>;
        phy-connection-type = "qsgmii";
        managed = "in-band-status";
-       status = "okay";
+       pcs-handle = <&pcs7_3>;
 };
 
 &duart0 {
@@ -234,11 +231,6 @@
                compatible = "atmel,at97sc3204t";
                reg = <0x29>;
        };
-
-       uc: board-controller@7e {
-               compatible = "traverse,ten64-controller";
-               reg = <0x7e>;
-       };
 };
 
 &i2c2 {
@@ -253,7 +245,7 @@
 &i2c3 {
        status = "okay";
 
-       i2c-switch@70 {
+       i2c-mux@70 {
                compatible = "nxp,pca9540";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -273,6 +265,22 @@
        };
 };
 
+&pcs_mdio1 {
+       status = "okay";
+};
+
+&pcs_mdio2 {
+       status = "okay";
+};
+
+&pcs_mdio3 {
+       status = "okay";
+};
+
+&pcs_mdio7 {
+       status = "okay";
+};
+
 &qspi {
        status = "okay";