From: Krzysztof Kozlowski Date: Fri, 5 Apr 2024 19:04:19 +0000 (+0200) Subject: arm64: dts: microchip: sparx5_pcb135: drop duplicated NOR flash X-Git-Tag: v6.10-rc1~239^2~10^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c7c4b91aa43;p=thirdparty%2Flinux.git arm64: dts: microchip: sparx5_pcb135: drop duplicated NOR flash 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_pcb135_board.dtsi:92.10-96.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 Tested-by: Steen Hegelund Reviewed-by: Steen Hegelund Signed-off-by: Conor Dooley --- diff --git a/arch/arm64/boot/dts/microchip/sparx5_pcb135_board.dtsi b/arch/arm64/boot/dts/microchip/sparx5_pcb135_board.dtsi index 20016efb3656a..af2f1831f07f8 100644 --- a/arch/arm64/boot/dts/microchip/sparx5_pcb135_board.dtsi +++ b/arch/arm64/boot/dts/microchip/sparx5_pcb135_board.dtsi @@ -87,15 +87,6 @@ }; }; -&spi0 { - status = "okay"; - flash@0 { - compatible = "jedec,spi-nor"; - spi-max-frequency = <8000000>; - reg = <0>; - }; -}; - &spi0 { status = "okay"; spi@0 {