From mboxrd@z Thu Jan 1 00:00:00 1970 From: Haikun Wang Date: Mon, 18 May 2015 21:25:03 +0800 Subject: [U-Boot] [PATCH v3 4/4] arm: ls102xa: Enable Driver Model SPI for ls1021atwr Message-ID: <1431955503-10979-1-git-send-email-haikun.wang@freescale.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de From: Haikun Wang 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 Change-Id: I6342807da7725ae8b678952117c8758c75a61d3d Reviewed-on: http://git.am.freescale.net:8181/33447 Tested-by: Review Code-CDREVIEW Reviewed-by: Prabhakar Kushwaha --- Changes in v3: - IS_ENABLED(CONFIG_XXX) is only work with configure option in Kconfig, and DM core code use IS_ENABLED(), so configure option in head file can't work, so remove CONFIG_OF_CONTROL CONFIG_OF_SEPARATE CONFIG_DM CONFIG_DM_SPI Changes in v2: - Move all changes inside of CONFIG_QSPI_BOOT Changes in v1: None include/configs/ls1021atwr.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 729205f..13e3aa4 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -229,16 +229,22 @@ #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_DM_SPI_FLASH #define CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH_STMICRO +#endif #endif /* -- 2.1.0.27.g96db324