Skip to content

Commit 3a94fa4

Browse files
krzkConchuOD
authored andcommitted
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 <[email protected]> Closes: https://lore.kernel.org/all/CAL_Jsq+PtL3HTKkA_gwTjb_i1mFZ+wW+qwin34HMYmwW7oNDFw@mail.gmail.com/ Signed-off-by: Krzysztof Kozlowski <[email protected]> Signed-off-by: Conor Dooley <[email protected]>
1 parent fe7c551 commit 3a94fa4

File tree

1 file changed

+47
-48
lines changed

1 file changed

+47
-48
lines changed

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

Lines changed: 47 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@
1313
priority = <200>;
1414
};
1515

16+
i2c0_imux: i2c-mux {
17+
compatible = "i2c-mux-pinctrl";
18+
#address-cells = <1>;
19+
#size-cells = <0>;
20+
i2c-parent = <&i2c0>;
21+
};
22+
1623
leds {
1724
compatible = "gpio-leds";
1825
led-0 {
@@ -56,6 +63,46 @@
5663
default-state = "off";
5764
};
5865
};
66+
67+
sfp_eth60: sfp-eth60 {
68+
compatible = "sff,sfp";
69+
i2c-bus = <&i2c_sfp1>;
70+
tx-disable-gpios = <&sgpio_out2 28 0 GPIO_ACTIVE_LOW>;
71+
rate-select0-gpios = <&sgpio_out2 28 1 GPIO_ACTIVE_HIGH>;
72+
los-gpios = <&sgpio_in2 28 0 GPIO_ACTIVE_HIGH>;
73+
mod-def0-gpios = <&sgpio_in2 28 1 GPIO_ACTIVE_LOW>;
74+
tx-fault-gpios = <&sgpio_in2 28 2 GPIO_ACTIVE_HIGH>;
75+
};
76+
77+
sfp_eth61: sfp-eth61 {
78+
compatible = "sff,sfp";
79+
i2c-bus = <&i2c_sfp2>;
80+
tx-disable-gpios = <&sgpio_out2 29 0 GPIO_ACTIVE_LOW>;
81+
rate-select0-gpios = <&sgpio_out2 29 1 GPIO_ACTIVE_HIGH>;
82+
los-gpios = <&sgpio_in2 29 0 GPIO_ACTIVE_HIGH>;
83+
mod-def0-gpios = <&sgpio_in2 29 1 GPIO_ACTIVE_LOW>;
84+
tx-fault-gpios = <&sgpio_in2 29 2 GPIO_ACTIVE_HIGH>;
85+
};
86+
87+
sfp_eth62: sfp-eth62 {
88+
compatible = "sff,sfp";
89+
i2c-bus = <&i2c_sfp3>;
90+
tx-disable-gpios = <&sgpio_out2 30 0 GPIO_ACTIVE_LOW>;
91+
rate-select0-gpios = <&sgpio_out2 30 1 GPIO_ACTIVE_HIGH>;
92+
los-gpios = <&sgpio_in2 30 0 GPIO_ACTIVE_HIGH>;
93+
mod-def0-gpios = <&sgpio_in2 30 1 GPIO_ACTIVE_LOW>;
94+
tx-fault-gpios = <&sgpio_in2 30 2 GPIO_ACTIVE_HIGH>;
95+
};
96+
97+
sfp_eth63: sfp-eth63 {
98+
compatible = "sff,sfp";
99+
i2c-bus = <&i2c_sfp4>;
100+
tx-disable-gpios = <&sgpio_out2 31 0 GPIO_ACTIVE_LOW>;
101+
rate-select0-gpios = <&sgpio_out2 31 1 GPIO_ACTIVE_HIGH>;
102+
los-gpios = <&sgpio_in2 31 0 GPIO_ACTIVE_HIGH>;
103+
mod-def0-gpios = <&sgpio_in2 31 1 GPIO_ACTIVE_LOW>;
104+
tx-fault-gpios = <&sgpio_in2 31 2 GPIO_ACTIVE_HIGH>;
105+
};
59106
};
60107

61108
&gpio {
@@ -119,15 +166,6 @@
119166
microchip,sgpio-port-ranges = <0 0>, <16 18>, <28 31>;
120167
};
121168

122-
&axi {
123-
i2c0_imux: i2c-mux {
124-
compatible = "i2c-mux-pinctrl";
125-
#address-cells = <1>;
126-
#size-cells = <0>;
127-
i2c-parent = <&i2c0>;
128-
};
129-
};
130-
131169
&i2c0_imux {
132170
pinctrl-names =
133171
"i2c_sfp1", "i2c_sfp2", "i2c_sfp3", "i2c_sfp4",
@@ -159,45 +197,6 @@
159197
};
160198
};
161199

162-
&axi {
163-
sfp_eth60: sfp-eth60 {
164-
compatible = "sff,sfp";
165-
i2c-bus = <&i2c_sfp1>;
166-
tx-disable-gpios = <&sgpio_out2 28 0 GPIO_ACTIVE_LOW>;
167-
rate-select0-gpios = <&sgpio_out2 28 1 GPIO_ACTIVE_HIGH>;
168-
los-gpios = <&sgpio_in2 28 0 GPIO_ACTIVE_HIGH>;
169-
mod-def0-gpios = <&sgpio_in2 28 1 GPIO_ACTIVE_LOW>;
170-
tx-fault-gpios = <&sgpio_in2 28 2 GPIO_ACTIVE_HIGH>;
171-
};
172-
sfp_eth61: sfp-eth61 {
173-
compatible = "sff,sfp";
174-
i2c-bus = <&i2c_sfp2>;
175-
tx-disable-gpios = <&sgpio_out2 29 0 GPIO_ACTIVE_LOW>;
176-
rate-select0-gpios = <&sgpio_out2 29 1 GPIO_ACTIVE_HIGH>;
177-
los-gpios = <&sgpio_in2 29 0 GPIO_ACTIVE_HIGH>;
178-
mod-def0-gpios = <&sgpio_in2 29 1 GPIO_ACTIVE_LOW>;
179-
tx-fault-gpios = <&sgpio_in2 29 2 GPIO_ACTIVE_HIGH>;
180-
};
181-
sfp_eth62: sfp-eth62 {
182-
compatible = "sff,sfp";
183-
i2c-bus = <&i2c_sfp3>;
184-
tx-disable-gpios = <&sgpio_out2 30 0 GPIO_ACTIVE_LOW>;
185-
rate-select0-gpios = <&sgpio_out2 30 1 GPIO_ACTIVE_HIGH>;
186-
los-gpios = <&sgpio_in2 30 0 GPIO_ACTIVE_HIGH>;
187-
mod-def0-gpios = <&sgpio_in2 30 1 GPIO_ACTIVE_LOW>;
188-
tx-fault-gpios = <&sgpio_in2 30 2 GPIO_ACTIVE_HIGH>;
189-
};
190-
sfp_eth63: sfp-eth63 {
191-
compatible = "sff,sfp";
192-
i2c-bus = <&i2c_sfp4>;
193-
tx-disable-gpios = <&sgpio_out2 31 0 GPIO_ACTIVE_LOW>;
194-
rate-select0-gpios = <&sgpio_out2 31 1 GPIO_ACTIVE_HIGH>;
195-
los-gpios = <&sgpio_in2 31 0 GPIO_ACTIVE_HIGH>;
196-
mod-def0-gpios = <&sgpio_in2 31 1 GPIO_ACTIVE_LOW>;
197-
tx-fault-gpios = <&sgpio_in2 31 2 GPIO_ACTIVE_HIGH>;
198-
};
199-
};
200-
201200
&mdio0 {
202201
status = "okay";
203202
phy0: ethernet-phy@0 {

0 commit comments

Comments
 (0)