diff mbox series

[v2,05/10] arm64: dts: microchip: sparx5_pcb134: align I2C mux node name with bindings

Message ID 20240405190419.74162-5-krzk@kernel.org (mailing list archive)
State New
Headers show
Series [v2,01/10] arm64: dts: microchip: sparx5: fix mdio reg | expand

Commit Message

Krzysztof Kozlowski April 5, 2024, 7:04 p.m. UTC
DT schema expects node names to match certain.  This fixes dtbs_check
warnings like:

  sparx5_pcb134_emmc.dtb: i2c0-emux@0: $nodename:0: 'i2c0-emux@0' does not match '^(i2c-?)?mux'

and dtc W=1 warnings:

  sparx5_pcb134_board.dtsi:398.25-403.4: Warning (unique_unit_address_if_enabled): /axi@600000000/i2c0-imux@0: duplicate unit-address (also used in node /axi@600000000/i2c0-emux@0)

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

---

Changes in v2:
1. None
---
 arch/arm64/boot/dts/microchip/sparx5_pcb134_board.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Rob Herring (Arm) April 11, 2024, 6:27 p.m. UTC | #1
On Fri, Apr 5, 2024 at 2:04 PM Krzysztof Kozlowski <krzk@kernel.org> wrote:
>
> DT schema expects node names to match certain.  This fixes dtbs_check
> warnings like:
>
>   sparx5_pcb134_emmc.dtb: i2c0-emux@0: $nodename:0: 'i2c0-emux@0' does not match '^(i2c-?)?mux'
>
> and dtc W=1 warnings:
>
>   sparx5_pcb134_board.dtsi:398.25-403.4: Warning (unique_unit_address_if_enabled): /axi@600000000/i2c0-imux@0: duplicate unit-address (also used in node /axi@600000000/i2c0-emux@0)
>
> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
>
> ---
>
> Changes in v2:
> 1. None
> ---
>  arch/arm64/boot/dts/microchip/sparx5_pcb134_board.dtsi | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/microchip/sparx5_pcb134_board.dtsi b/arch/arm64/boot/dts/microchip/sparx5_pcb134_board.dtsi
> index e816e6e9d62d..cafec6ef0d0f 100644
> --- a/arch/arm64/boot/dts/microchip/sparx5_pcb134_board.dtsi
> +++ b/arch/arm64/boot/dts/microchip/sparx5_pcb134_board.dtsi
> @@ -395,13 +395,13 @@ i2cmux_11: i2cmux-11-pins {
>  };
>
>  &axi {
> -       i2c0_imux: i2c0-imux@0 {
> +       i2c0_imux: i2c-mux-0 {

Doesn't this introduce a new warning with simple-bus.yaml? These
devices shouldn't be under an AXI bus which should require a
unit-address.

All the sft-eth* nodes have the same problem:
axi@600000000: sfp-eth63: {'compatible': ['sff,sfp'], 'i2c-bus':
[[91]], 'tx-disable-gpios': [[87, 31, 0, 1]], 'rate-select0-gpios':
[[87, 31, 1, 0]], 'los-gpios': [[88, 31, 0, 0]], 'mod-def0-gpios':
[[88, 31, 1, 1]], 'tx-fault-gpios': [[88, 31, 2, 0]], 'phandle':
[[78]]} should not be valid under {'type': 'object'}


Rob
Krzysztof Kozlowski April 11, 2024, 7:06 p.m. UTC | #2
On 11/04/2024 20:27, Rob Herring wrote:
>>  };
>>
>>  &axi {
>> -       i2c0_imux: i2c0-imux@0 {
>> +       i2c0_imux: i2c-mux-0 {
> 
> Doesn't this introduce a new warning with simple-bus.yaml? These
> devices shouldn't be under an AXI bus which should require a
> unit-address.
> 
> All the sft-eth* nodes have the same problem:
> axi@600000000: sfp-eth63: {'compatible': ['sff,sfp'], 'i2c-bus':
> [[91]], 'tx-disable-gpios': [[87, 31, 0, 1]], 'rate-select0-gpios':
> [[87, 31, 1, 0]], 'los-gpios': [[88, 31, 0, 0]], 'mod-def0-gpios':
> [[88, 31, 1, 1]], 'tx-fault-gpios': [[88, 31, 2, 0]], 'phandle':
> [[78]]} should not be valid under {'type': 'object'}
> 

True, this replaces one dtc warning with another, so the new one is:
Warning (simple_bus_reg): /axi@600000000/i2c-mux: missing or empty
reg/ranges property

which I kind of missed, because there are several other sfp nodes
causing the warning, like you mentioned above.

The true solution is to probably bring them out of axi bus, but for that
I would need to try to understand why they were put there in the first
place...


Best regards,
Krzysztof
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/microchip/sparx5_pcb134_board.dtsi b/arch/arm64/boot/dts/microchip/sparx5_pcb134_board.dtsi
index e816e6e9d62d..cafec6ef0d0f 100644
--- a/arch/arm64/boot/dts/microchip/sparx5_pcb134_board.dtsi
+++ b/arch/arm64/boot/dts/microchip/sparx5_pcb134_board.dtsi
@@ -395,13 +395,13 @@  i2cmux_11: i2cmux-11-pins {
 };
 
 &axi {
-	i2c0_imux: i2c0-imux@0 {
+	i2c0_imux: i2c-mux-0 {
 		compatible = "i2c-mux-pinctrl";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		i2c-parent = <&i2c0>;
 	};
-	i2c0_emux: i2c0-emux@0 {
+	i2c0_emux: i2c-mux-1 {
 		compatible = "i2c-mux-gpio";
 		#address-cells = <1>;
 		#size-cells = <0>;