Commit fe7c551e authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Conor Dooley
Browse files

arm64: dts: microchip: sparx5_pcb134: 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_pcb134.dtb: axi@600000000: i2c-mux-0: {'compatible': ... should not be valid under {'type': 'object'}
    from schema $id: http://devicetree.org/schemas/simple-bus.yaml#



Reported-by: default avatarRob Herring <robh@kernel.org>
Closes: https://lore.kernel.org/all/CAL_Jsq+PtL3HTKkA_gwTjb_i1mFZ+wW+qwin34HMYmwW7oNDFw@mail.gmail.com/


Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: default avatarConor Dooley <conor.dooley@microchip.com>
parent 1613e604

arch/arm64/boot/dts/microchip/sparx5_pcb134_board.dtsi

+194 −178
Original line number Diff line number Diff line
@@ -13,6 +13,20 @@ gpio-restart { 
		priority = <200>;

	};



	i2c0_imux: i2c-mux-0 {

		compatible = "i2c-mux-pinctrl";

		#address-cells = <1>;

		#size-cells = <0>;

		i2c-parent = <&i2c0>;

	};



	i2c0_emux: i2c-mux-1 {

		compatible = "i2c-mux-gpio";

		#address-cells = <1>;

		#size-cells = <0>;

		i2c-parent = <&i2c0>;

	};



	leds {

		compatible = "gpio-leds";

		led-0 {
@@ -248,6 +262,186 @@ led-47 { 
			default-state = "off";

		};

	};



	sfp_eth12: sfp-eth12 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp1>;

		tx-disable-gpios = <&sgpio_out2 11 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 11 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 11 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 12 0 GPIO_ACTIVE_HIGH>;

	};



	sfp_eth13: sfp-eth13 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp2>;

		tx-disable-gpios = <&sgpio_out2 12 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 12 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 12 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 13 0 GPIO_ACTIVE_HIGH>;

	};



	sfp_eth14: sfp-eth14 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp3>;

		tx-disable-gpios = <&sgpio_out2 13 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 13 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 13 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 14 0 GPIO_ACTIVE_HIGH>;

	};



	sfp_eth15: sfp-eth15 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp4>;

		tx-disable-gpios = <&sgpio_out2 14 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 14 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 14 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 15 0 GPIO_ACTIVE_HIGH>;

	};



	sfp_eth48: sfp-eth48 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp5>;

		tx-disable-gpios = <&sgpio_out2 15 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 15 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 15 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 16 0 GPIO_ACTIVE_HIGH>;

	};



	sfp_eth49: sfp-eth49 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp6>;

		tx-disable-gpios = <&sgpio_out2 16 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 16 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 16 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 17 0 GPIO_ACTIVE_HIGH>;

	};



	sfp_eth50: sfp-eth50 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp7>;

		tx-disable-gpios = <&sgpio_out2 17 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 17 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 17 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 18 0 GPIO_ACTIVE_HIGH>;

	};



	sfp_eth51: sfp-eth51 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp8>;

		tx-disable-gpios = <&sgpio_out2 18 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 18 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 18 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 19 0 GPIO_ACTIVE_HIGH>;

	};



	sfp_eth52: sfp-eth52 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp9>;

		tx-disable-gpios = <&sgpio_out2 19 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 19 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 19 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 20 0 GPIO_ACTIVE_HIGH>;

	};



	sfp_eth53: sfp-eth53 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp10>;

		tx-disable-gpios = <&sgpio_out2 20 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 20 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 20 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 21 0 GPIO_ACTIVE_HIGH>;

	};



	sfp_eth54: sfp-eth54 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp11>;

		tx-disable-gpios = <&sgpio_out2 21 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 21 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 21 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 22 0 GPIO_ACTIVE_HIGH>;

	};



	sfp_eth55: sfp-eth55 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp12>;

		tx-disable-gpios = <&sgpio_out2 22 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 22 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 22 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 23 0 GPIO_ACTIVE_HIGH>;

	};



	sfp_eth56: sfp-eth56 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp13>;

		tx-disable-gpios = <&sgpio_out2 23 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 23 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 23 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 24 0 GPIO_ACTIVE_HIGH>;

	};



	sfp_eth57: sfp-eth57 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp14>;

		tx-disable-gpios = <&sgpio_out2 24 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 24 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 24 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 25 0 GPIO_ACTIVE_HIGH>;

	};



	sfp_eth58: sfp-eth58 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp15>;

		tx-disable-gpios = <&sgpio_out2 25 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 25 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 25 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 26 0 GPIO_ACTIVE_HIGH>;

	};



	sfp_eth59: sfp-eth59 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp16>;

		tx-disable-gpios = <&sgpio_out2 26 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 26 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 26 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 27 0 GPIO_ACTIVE_HIGH>;

	};



	sfp_eth60: sfp-eth60 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp17>;

		tx-disable-gpios = <&sgpio_out2 27 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 27 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 27 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 28 0 GPIO_ACTIVE_HIGH>;

	};



	sfp_eth61: sfp-eth61 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp18>;

		tx-disable-gpios = <&sgpio_out2 28 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 28 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 28 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 29 0 GPIO_ACTIVE_HIGH>;

	};



	sfp_eth62: sfp-eth62 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp19>;

		tx-disable-gpios = <&sgpio_out2 29 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 29 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 29 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 30 0 GPIO_ACTIVE_HIGH>;

	};



	sfp_eth63: sfp-eth63 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp20>;

		tx-disable-gpios = <&sgpio_out2 30 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 30 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 30 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 31 0 GPIO_ACTIVE_HIGH>;

	};

};



&sgpio0 {
@@ -385,21 +579,6 @@ i2cmux_11: i2cmux-11-pins { 
	};

};



&axi {

	i2c0_imux: i2c-mux-0 {

		compatible = "i2c-mux-pinctrl";

		#address-cells = <1>;

		#size-cells = <0>;

		i2c-parent = <&i2c0>;

	};

	i2c0_emux: i2c-mux-1 {

		compatible = "i2c-mux-gpio";

		#address-cells = <1>;

		#size-cells = <0>;

		i2c-parent = <&i2c0>;

	};

};



&i2c0_imux {

	pinctrl-names =

		"i2c_sfp1", "i2c_sfp2", "i2c_sfp3", "i2c_sfp4",
@@ -535,169 +714,6 @@ phy64: ethernet-phy@64 { 
	};

};



&axi {

	sfp_eth12: sfp-eth12 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp1>;

		tx-disable-gpios = <&sgpio_out2 11 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 11 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 11 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 12 0 GPIO_ACTIVE_HIGH>;

	};

	sfp_eth13: sfp-eth13 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp2>;

		tx-disable-gpios = <&sgpio_out2 12 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 12 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 12 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 13 0 GPIO_ACTIVE_HIGH>;

	};

	sfp_eth14: sfp-eth14 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp3>;

		tx-disable-gpios = <&sgpio_out2 13 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 13 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 13 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 14 0 GPIO_ACTIVE_HIGH>;

	};

	sfp_eth15: sfp-eth15 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp4>;

		tx-disable-gpios = <&sgpio_out2 14 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 14 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 14 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 15 0 GPIO_ACTIVE_HIGH>;

	};

	sfp_eth48: sfp-eth48 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp5>;

		tx-disable-gpios = <&sgpio_out2 15 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 15 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 15 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 16 0 GPIO_ACTIVE_HIGH>;

	};

	sfp_eth49: sfp-eth49 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp6>;

		tx-disable-gpios = <&sgpio_out2 16 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 16 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 16 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 17 0 GPIO_ACTIVE_HIGH>;

	};

	sfp_eth50: sfp-eth50 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp7>;

		tx-disable-gpios = <&sgpio_out2 17 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 17 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 17 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 18 0 GPIO_ACTIVE_HIGH>;

	};

	sfp_eth51: sfp-eth51 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp8>;

		tx-disable-gpios = <&sgpio_out2 18 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 18 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 18 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 19 0 GPIO_ACTIVE_HIGH>;

	};

	sfp_eth52: sfp-eth52 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp9>;

		tx-disable-gpios = <&sgpio_out2 19 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 19 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 19 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 20 0 GPIO_ACTIVE_HIGH>;

	};

	sfp_eth53: sfp-eth53 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp10>;

		tx-disable-gpios = <&sgpio_out2 20 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 20 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 20 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 21 0 GPIO_ACTIVE_HIGH>;

	};

	sfp_eth54: sfp-eth54 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp11>;

		tx-disable-gpios = <&sgpio_out2 21 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 21 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 21 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 22 0 GPIO_ACTIVE_HIGH>;

	};

	sfp_eth55: sfp-eth55 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp12>;

		tx-disable-gpios = <&sgpio_out2 22 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 22 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 22 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 23 0 GPIO_ACTIVE_HIGH>;

	};

	sfp_eth56: sfp-eth56 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp13>;

		tx-disable-gpios = <&sgpio_out2 23 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 23 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 23 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 24 0 GPIO_ACTIVE_HIGH>;

	};

	sfp_eth57: sfp-eth57 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp14>;

		tx-disable-gpios = <&sgpio_out2 24 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 24 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 24 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 25 0 GPIO_ACTIVE_HIGH>;

	};

	sfp_eth58: sfp-eth58 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp15>;

		tx-disable-gpios = <&sgpio_out2 25 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 25 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 25 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 26 0 GPIO_ACTIVE_HIGH>;

	};

	sfp_eth59: sfp-eth59 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp16>;

		tx-disable-gpios = <&sgpio_out2 26 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 26 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 26 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 27 0 GPIO_ACTIVE_HIGH>;

	};

	sfp_eth60: sfp-eth60 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp17>;

		tx-disable-gpios = <&sgpio_out2 27 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 27 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 27 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 28 0 GPIO_ACTIVE_HIGH>;

	};

	sfp_eth61: sfp-eth61 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp18>;

		tx-disable-gpios = <&sgpio_out2 28 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 28 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 28 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 29 0 GPIO_ACTIVE_HIGH>;

	};

	sfp_eth62: sfp-eth62 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp19>;

		tx-disable-gpios = <&sgpio_out2 29 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 29 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 29 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 30 0 GPIO_ACTIVE_HIGH>;

	};

	sfp_eth63: sfp-eth63 {

		compatible = "sff,sfp";

		i2c-bus = <&i2c_sfp20>;

		tx-disable-gpios = <&sgpio_out2 30 1 GPIO_ACTIVE_LOW>;

		los-gpios = <&sgpio_in2 30 1 GPIO_ACTIVE_HIGH>;

		mod-def0-gpios = <&sgpio_in2 30 2 GPIO_ACTIVE_LOW>;

		tx-fault-gpios = <&sgpio_in2 31 0 GPIO_ACTIVE_HIGH>;

	};

};



&switch {

	ethernet-ports {

		#address-cells = <1>;