[PATCH 8/8] ARM: dts: aspeed: g6: Remove board-level flash stubs
Jacky Huang <[email protected]>
| Newsgroups | org.ozlabs.lists.linux-aspeed,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-kernel,org.ozlabs.lists.openbmc |
|---|---|
| Message-ID | <[email protected]> |
SPI NOR flashes describe board population, not SoC IP. With boards now declaring the flashes they use, drop the disabled flash@* stubs from aspeed-g6.dtsi and leave only the FMC/SPI controllers. Signed-off-by: Jacky Huang <[email protected]> --- arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 56 ------------------------- 1 file changed, 56 deletions(-) diff --git a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi index edf4b74f5aba..de705c544847 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi +++ b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi @@ -119,27 +119,6 @@ fmc: spi@1e620000 { clocks = <&syscon ASPEED_CLK_AHB>; status = "disabled"; interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; - flash@0 { - reg = < 0 >; - compatible = "jedec,spi-nor"; - spi-max-frequency = <50000000>; - spi-rx-bus-width = <2>; - status = "disabled"; - }; - flash@1 { - reg = < 1 >; - compatible = "jedec,spi-nor"; - spi-max-frequency = <50000000>; - spi-rx-bus-width = <2>; - status = "disabled"; - }; - flash@2 { - reg = < 2 >; - compatible = "jedec,spi-nor"; - spi-max-frequency = <50000000>; - spi-rx-bus-width = <2>; - status = "disabled"; - }; }; spi1: spi@1e630000 { @@ -149,20 +128,6 @@ spi1: spi@1e630000 { compatible = "aspeed,ast2600-spi"; clocks = <&syscon ASPEED_CLK_AHB>; status = "disabled"; - flash@0 { - reg = < 0 >; - compatible = "jedec,spi-nor"; - spi-max-frequency = <50000000>; - spi-rx-bus-width = <2>; - status = "disabled"; - }; - flash@1 { - reg = < 1 >; - compatible = "jedec,spi-nor"; - spi-max-frequency = <50000000>; - spi-rx-bus-width = <2>; - status = "disabled"; - }; }; spi2: spi@1e631000 { @@ -172,27 +137,6 @@ spi2: spi@1e631000 { compatible = "aspeed,ast2600-spi"; clocks = <&syscon ASPEED_CLK_AHB>; status = "disabled"; - flash@0 { - reg = < 0 >; - compatible = "jedec,spi-nor"; - spi-max-frequency = <50000000>; - spi-rx-bus-width = <2>; - status = "disabled"; - }; - flash@1 { - reg = < 1 >; - compatible = "jedec,spi-nor"; - spi-max-frequency = <50000000>; - spi-rx-bus-width = <2>; - status = "disabled"; - }; - flash@2 { - reg = < 2 >; - compatible = "jedec,spi-nor"; - spi-max-frequency = <50000000>; - spi-rx-bus-width = <2>; - status = "disabled"; - }; }; mdio0: mdio@1e650000 { -- 2.43.0