diff mbox

[U-Boot,4/5] arm: ls102xa: Enable Driver Model SPI for ls1021atwr

Message ID 1435429920-32466-5-git-send-email-jteki@openedev.com
State Accepted
Delegated to: Jagannadha Sutradharudu Teki
Headers show

Commit Message

Jagan Teki June 27, 2015, 6:31 p.m. UTC 
From: Haikun Wang <Haikun.Wang@freescale.com>

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>
Reviewed-by: Prabhakar Kushwaha <prabhakar@freescale.com>
Reviewed-by: Jagan Teki <jteki@openedev.com>
---
Changes in v7:
- Rebase to master

Changes in v4:
- Add defconfig patch in this series

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 

 include/configs/ls1021atwr.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Comments

Haikun.Wang@freescale.com June 29, 2015, 7:48 a.m. UTC | #1 
On 6/28/2015 2:32 AM, Jagan Teki wrote:
> From: Haikun Wang <Haikun.Wang@freescale.com>
>
> 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>
> Reviewed-by: Prabhakar Kushwaha <prabhakar@freescale.com>
> Reviewed-by: Jagan Teki <jteki@openedev.com>
> ---
> Changes in v7:
> - Rebase to master
>
> Changes in v4:
> - Add defconfig patch in this series
>
> 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
>
>   include/configs/ls1021atwr.h | 9 +++++++--
>   1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
> index 446d562..233b3d0 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
>
>   /*
>
Tested-by: Haikun Wang <haikun.wang@freescale.com>
diff mbox

Patch

diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 446d562..233b3d0 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
 
 /*