From 332b98660f964895f05277dbbc2e0fd05d04ca9b Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Sat, 19 Dec 2020 10:40:02 -0700
Subject: [PATCH] x86: apl: Use struct spi_nor instead of struct spi_flash

This construct effectively uses struct spi_nor due to a #define in
spi-nor.h so we may as well use that struct here. This allows dtoc to
parse it correctly.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 arch/x86/cpu/apollolake/spl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/cpu/apollolake/spl.c b/arch/x86/cpu/apollolake/spl.c
index 16a2f15c6b..8991d5e648 100644
--- a/arch/x86/cpu/apollolake/spl.c
+++ b/arch/x86/cpu/apollolake/spl.c
@@ -97,7 +97,7 @@ U_BOOT_DRIVER(winbond_w25q128fw) = {
 	.id		= UCLASS_SPI_FLASH,
 	.of_match	= apl_flash_ids,
 	.probe		= apl_flash_probe,
-	.priv_auto	= sizeof(struct spi_flash),
+	.priv_auto	= sizeof(struct spi_nor),
 	.ops		= &apl_flash_ops,
 };
 
-- 
2.39.5