[PATCH] mtd: spi-nor: Guard SPI_STACKED_PARALLEL with DM_SPI check

[Tom Rini]

On Thu, Oct 31, 2024 at 12:37:32PM -0600, Tom Rini wrote:
> 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")
> Signed-off-by: Tom Rini <trini at konsulko.com>
> ---
>  drivers/mtd/spi/spi-nor-core.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
> index a3a62fff213e..ec841fb13bd4 100644
> --- 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);
>  

Whoops, forgot to CC Marek.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20241031/e3ae7af6/attachment.sig>