From: Haikun Wang <Haikun.Wang@freescale.com>
Date: Sat, 27 Jun 2015 16:16:13 +0000 (+0530)
Subject: arm: ls102xa: Enable Driver Model SPI for ls1021atwr
X-Git-Tag: v2015.07-rc3~6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9dd3d3c00c3125f510b899b89432586bf260a3de;p=oweals%2Fu-boot.git

arm: ls102xa: Enable Driver Model SPI for ls1021atwr

Enable Driver Model SPI for ls1021atwr board.
DSPI and QSPI only be enabled when boot from QSPI.
DSPI and QSPI are compatible under Driver Model SPI.

Signed-off-by: Haikun Wang <Haikun.Wang@freescale.com>
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Tested-by: Haikun Wang <haikun.wang@freescale.com>
Reviewed-by: Prabhakar Kushwaha <prabhakar@freescale.com>
Reviewed-by: Jagan Teki <jteki@openedev.com>
---

diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 446d562bb8..233b3d092c 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -250,15 +250,20 @@
 #define CONFIG_CMD_FAT
 #define CONFIG_DOS_PARTITION
 
-/* QSPI */
+/* SPI */
 #ifdef CONFIG_QSPI_BOOT
+/* QSPI */
 #define CONFIG_FSL_QSPI
 #define QSPI0_AMBA_BASE			0x40000000
 #define FSL_QSPI_FLASH_SIZE		(1 << 24)
 #define FSL_QSPI_FLASH_NUM		2
+#define CONFIG_SPI_FLASH_STMICRO
 
+/* DM SPI */
+#if defined(CONFIG_FSL_DSPI) || defined(CONFIG_FSL_QSPI)
 #define CONFIG_CMD_SF
-#define CONFIG_SPI_FLASH_STMICRO
+#define CONFIG_DM_SPI_FLASH
+#endif
 #endif
 
 /*