arm64: dts: microchip: sparx5_pcb135: move non-MMIO nodes out of axi

simple-bus nodes, so the "axi" node, should not have non-MMIO children
as pointed out by simple-bus schema dtbs_check:

  sparx5_pcb135_emmc.dtb: axi@600000000: sfp-eth60: {'compatible': ... should not be valid under {'type': 'object'}
    from schema $id: http://devicetree.org/schemas/simple-bus.yaml#

Reported-by: Rob Herring <robh@kernel.org>
Closes: https://lore.kernel.org/all/CAL_Jsq+PtL3HTKkA_gwTjb_i1mFZ+wW+qwin34HMYmwW7oNDFw@mail.gmail.com/
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>

diff --git a/arch/arm64/boot/dts/microchip/sparx5_pcb135_board.dtsi b/arch/arm64/boot/dts/microchip/sparx5_pcb135_board.dtsi
index af2f1831f07f890a5e7f8d3593453ad3f78bb098..196868898f496328bd7b8aa24a96f01fd01e4330 100644 (file)
--- a/arch/arm64/boot/dts/microchip/sparx5_pcb135_board.dtsi
+++ b/arch/arm64/boot/dts/microchip/sparx5_pcb135_board.dtsi
@@ -13,6 +13,13 @@
                priority = <200>;
        };
 
+       i2c0_imux: i2c-mux {
+               compatible = "i2c-mux-pinctrl";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               i2c-parent = <&i2c0>;
+       };
+
        leds {
                compatible = "gpio-leds";
                led-0 {
@@ -56,6 +63,46 @@
                        default-state = "off";
                };
        };
+
+       sfp_eth60: sfp-eth60 {
+               compatible       = "sff,sfp";
+               i2c-bus = <&i2c_sfp1>;
+               tx-disable-gpios = <&sgpio_out2 28 0 GPIO_ACTIVE_LOW>;
+               rate-select0-gpios = <&sgpio_out2 28 1 GPIO_ACTIVE_HIGH>;
+               los-gpios = <&sgpio_in2 28 0 GPIO_ACTIVE_HIGH>;
+               mod-def0-gpios = <&sgpio_in2 28 1 GPIO_ACTIVE_LOW>;
+               tx-fault-gpios = <&sgpio_in2 28 2 GPIO_ACTIVE_HIGH>;
+       };
+
+       sfp_eth61: sfp-eth61 {
+               compatible = "sff,sfp";
+               i2c-bus = <&i2c_sfp2>;
+               tx-disable-gpios = <&sgpio_out2 29 0 GPIO_ACTIVE_LOW>;
+               rate-select0-gpios = <&sgpio_out2 29 1 GPIO_ACTIVE_HIGH>;
+               los-gpios = <&sgpio_in2 29 0 GPIO_ACTIVE_HIGH>;
+               mod-def0-gpios = <&sgpio_in2 29 1 GPIO_ACTIVE_LOW>;
+               tx-fault-gpios = <&sgpio_in2 29 2 GPIO_ACTIVE_HIGH>;
+       };
+
+       sfp_eth62: sfp-eth62 {
+               compatible = "sff,sfp";
+               i2c-bus = <&i2c_sfp3>;
+               tx-disable-gpios = <&sgpio_out2 30 0 GPIO_ACTIVE_LOW>;
+               rate-select0-gpios = <&sgpio_out2 30 1 GPIO_ACTIVE_HIGH>;
+               los-gpios = <&sgpio_in2 30 0 GPIO_ACTIVE_HIGH>;
+               mod-def0-gpios = <&sgpio_in2 30 1 GPIO_ACTIVE_LOW>;
+               tx-fault-gpios = <&sgpio_in2 30 2 GPIO_ACTIVE_HIGH>;
+       };
+
+       sfp_eth63: sfp-eth63 {
+               compatible = "sff,sfp";
+               i2c-bus = <&i2c_sfp4>;
+               tx-disable-gpios = <&sgpio_out2 31 0 GPIO_ACTIVE_LOW>;
+               rate-select0-gpios = <&sgpio_out2 31 1 GPIO_ACTIVE_HIGH>;
+               los-gpios = <&sgpio_in2 31 0 GPIO_ACTIVE_HIGH>;
+               mod-def0-gpios = <&sgpio_in2 31 1 GPIO_ACTIVE_LOW>;
+               tx-fault-gpios = <&sgpio_in2 31 2 GPIO_ACTIVE_HIGH>;
+       };
 };
 
 &gpio {
@@ -119,15 +166,6 @@
        microchip,sgpio-port-ranges = <0 0>, <16 18>, <28 31>;
 };
 
-&axi {
-       i2c0_imux: i2c-mux {
-               compatible = "i2c-mux-pinctrl";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               i2c-parent = <&i2c0>;
-       };
-};
-
 &i2c0_imux {
        pinctrl-names =
                "i2c_sfp1", "i2c_sfp2", "i2c_sfp3", "i2c_sfp4",
@@ -159,45 +197,6 @@
        };
 };
 
-&axi {
-       sfp_eth60: sfp-eth60 {
-               compatible       = "sff,sfp";
-               i2c-bus = <&i2c_sfp1>;
-               tx-disable-gpios = <&sgpio_out2 28 0 GPIO_ACTIVE_LOW>;
-               rate-select0-gpios = <&sgpio_out2 28 1 GPIO_ACTIVE_HIGH>;
-               los-gpios = <&sgpio_in2 28 0 GPIO_ACTIVE_HIGH>;
-               mod-def0-gpios = <&sgpio_in2 28 1 GPIO_ACTIVE_LOW>;
-               tx-fault-gpios = <&sgpio_in2 28 2 GPIO_ACTIVE_HIGH>;
-       };
-       sfp_eth61: sfp-eth61 {
-               compatible = "sff,sfp";
-               i2c-bus = <&i2c_sfp2>;
-               tx-disable-gpios = <&sgpio_out2 29 0 GPIO_ACTIVE_LOW>;
-               rate-select0-gpios = <&sgpio_out2 29 1 GPIO_ACTIVE_HIGH>;
-               los-gpios = <&sgpio_in2 29 0 GPIO_ACTIVE_HIGH>;
-               mod-def0-gpios = <&sgpio_in2 29 1 GPIO_ACTIVE_LOW>;
-               tx-fault-gpios = <&sgpio_in2 29 2 GPIO_ACTIVE_HIGH>;
-       };
-       sfp_eth62: sfp-eth62 {
-               compatible = "sff,sfp";
-               i2c-bus = <&i2c_sfp3>;
-               tx-disable-gpios = <&sgpio_out2 30 0 GPIO_ACTIVE_LOW>;
-               rate-select0-gpios = <&sgpio_out2 30 1 GPIO_ACTIVE_HIGH>;
-               los-gpios = <&sgpio_in2 30 0 GPIO_ACTIVE_HIGH>;
-               mod-def0-gpios = <&sgpio_in2 30 1 GPIO_ACTIVE_LOW>;
-               tx-fault-gpios = <&sgpio_in2 30 2 GPIO_ACTIVE_HIGH>;
-       };
-       sfp_eth63: sfp-eth63 {
-               compatible = "sff,sfp";
-               i2c-bus = <&i2c_sfp4>;
-               tx-disable-gpios = <&sgpio_out2 31 0 GPIO_ACTIVE_LOW>;
-               rate-select0-gpios = <&sgpio_out2 31 1 GPIO_ACTIVE_HIGH>;
-               los-gpios = <&sgpio_in2 31 0 GPIO_ACTIVE_HIGH>;
-               mod-def0-gpios = <&sgpio_in2 31 1 GPIO_ACTIVE_LOW>;
-               tx-fault-gpios = <&sgpio_in2 31 2 GPIO_ACTIVE_HIGH>;
-       };
-};
-
 &mdio0 {
        status = "okay";
        phy0: ethernet-phy@0 {