]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
arm64: dts: microchip: sparx5_pcb134: drop duplicated NOR flash
authorKrzysztof Kozlowski <krzk@kernel.org>
Fri, 5 Apr 2024 19:04:18 +0000 (21:04 +0200)
committerConor Dooley <conor.dooley@microchip.com>
Mon, 8 Apr 2024 15:56:14 +0000 (16:56 +0100)
Since beginning the DTS extended the SPI0 in two places adding two SPI
muxes, each with same SPI NOR flash.  Both used exactly the same
chip-selects, so this was clearly buggy code.  Then in commit
d0f482bb06f9 ("arm64: dts: sparx5: Add the Sparx5 switch node") one SPI
mux was removed, while keeping the SPI NOR flash node.

This still leaves duplicated SPI nodes under same chip select 0,
reported by dtc W=1 warnings:

  sparx5_pcb134_board.dtsi:277.10-281.4: Warning (unique_unit_address_if_enabled): /axi@600000000/spi@600104000/flash@0: duplicate unit-address (also used in node /axi@600000000/spi@600104000/spi@0)

Steen Hegelund confirmed that in fact there is a SPI mux, thus remove
the duplicated node without the mux.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Tested-by: Steen Hegelund <Steen.Hegelund@microchip.com>
Reviewed-by: Steen Hegelund <Steen.Hegelund@microchip.com>
Reviewed-by: Steen Hegelund <Steen.Hegelund@microchip.com>
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
arch/arm64/boot/dts/microchip/sparx5_pcb134_board.dtsi

index f165a409bc1d68119811a7522e5f0fc8059ef5e6..2c5574734c9e3261029c7d1782dd890b7f7cc308 100644 (file)
        };
 };
 
-&spi0 {
-       status = "okay";
-       flash@0 {
-               compatible = "jedec,spi-nor";
-               spi-max-frequency = <8000000>;
-               reg = <0>;
-       };
-};
-
 &spi0 {
        status = "okay";
        spi@0 {