mtd: spi-nor: Guard SPI_STACKED_PARALLEL with DM_SPI check

While we want to compile the SPI_STACKED_PARALLEL code everywhere we
can, it must first be guarded with an #if for DM_SPI as not all cases
where we have this code built, such as in SPL, will have the relevant
DM_SPI option enabled.

Fixes: 43423cdc5dc1 ("mtd: spi-nor: Always build SPI_STACKED_PARALLEL code")
Reviewed-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index a3a62fff213e062bb8a9a2b6a5232ea4b55871b0..ec841fb13bd46588dde7d03c323912f0eefe4a56 100644 (file)
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -3166,6 +3166,7 @@ static int spi_nor_init_params(struct spi_nor *nor,
                spi_nor_post_sfdp_fixups(nor, params);
        }
 
+#if CONFIG_IS_ENABLED(DM_SPI)
        if (CONFIG_IS_ENABLED(SPI_STACKED_PARALLEL)) {
                u64 flash_size[SNOR_FLASH_CNT_MAX] = { 0 };
                struct udevice *dev = nor->spi->dev;
@@ -3227,6 +3228,7 @@ static int spi_nor_init_params(struct spi_nor *nor,
                        params->page_size <<= 1;
                }
        }
+#endif
 
        spi_nor_late_init_fixups(nor, params);