From: Haikun Wang Date: Mon, 29 Jun 2015 07:38:46 +0000 (+0530) Subject: arm: ls102xa: Enable Driver Model SPI for ls1021aqds X-Git-Tag: v2015.07-rc3~7 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e5493d4e49cb399c5a506f080fd8b4fa2faf3a19;p=oweals%2Fu-boot.git arm: ls102xa: Enable Driver Model SPI for ls1021aqds Enable Driver Model SPI for ls1021aqds board. DSPI and QSPI is enabled only when boot from QSPI. DSPI and QSPI are compatible under Driver Model SPI. Signed-off-by: Haikun Wang Tested-by: Haikun Wang Reviewed-by: Jagan Teki --- diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 5c9d275ebe..46c609af89 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -407,15 +407,24 @@ unsigned long get_board_ddr_clk(void); #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_SPANSION +/* DSPI */ +#define CONFIG_FSL_DSPI + +/* DM SPI */ +#if defined(CONFIG_FSL_DSPI) || defined(CONFIG_FSL_QSPI) #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH_SPANSION +#define CONFIG_DM_SPI_FLASH +#define CONFIG_SF_DATAFLASH +#endif #endif /*