diff mbox

[U-Boot,v3,3/4] arm: ls102xa: Enable Driver Model SPI for ls1021aqds

Message ID 1431955488-10937-1-git-send-email-haikun.wang@freescale.com
State Accepted
Delegated to: Jagannadha Sutradharudu Teki
Headers show

Commit Message

Haikun.Wang@freescale.com May 18, 2015, 1:24 p.m. UTC
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 <Haikun.Wang@freescale.com>
---
Changes in v3:
- Remove CONFIG_SPI_FLASH_ATMEL
- 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/ls1021aqds.h | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

Comments

York Sun May 18, 2015, 4:22 p.m. UTC | #1
Haikun,

On 05/18/2015 06:24 AM, Haikun Wang wrote:
> 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 <Haikun.Wang@freescale.com>
> ---
> Changes in v3:
> - Remove CONFIG_SPI_FLASH_ATMEL
> - 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/ls1021aqds.h | 13 +++++++++++--
>  1 file changed, 11 insertions(+), 2 deletions(-)


I lost track of your patch set. You have v3 3/4 and v3 4/4. Where are the first
two patches in this set?

The subject arm:ls102xa is not too bad. For future patches, I prefer the subject
to be <arch>/<soc>, or <arch>/<board>. This one should have arm/ls1021aqds, or
armv7/ls1021aqds. It helps maintainers to delegate the patches to custodians.

York
Haikun.Wang@freescale.com May 19, 2015, 2:50 a.m. UTC | #2
On 5/19/2015 12:22 AM, Sun York-R58495 wrote:
> Haikun,
>
> On 05/18/2015 06:24 AM, Haikun Wang wrote:
>> 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 <Haikun.Wang@freescale.com>
>> ---
>> Changes in v3:
>> - Remove CONFIG_SPI_FLASH_ATMEL
>> - 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/ls1021aqds.h | 13 +++++++++++--
>>   1 file changed, 11 insertions(+), 2 deletions(-)
>
>
> I lost track of your patch set. You have v3 3/4 and v3 4/4. Where are the first
> two patches in this set?
Sorry, I forget copy to you in the two previous patches.
I will copy to you now.
>
> The subject arm:ls102xa is not too bad. For future patches, I prefer the subject
> to be <arch>/<soc>, or <arch>/<board>. This one should have arm/ls1021aqds, or
> armv7/ls1021aqds. It helps maintainers to delegate the patches to custodians.
Fine.
>
> York
>
diff mbox

Patch

diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 9a8fd50..55f52e8 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -409,16 +409,25 @@  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_DM_SPI_FLASH
 #define CONFIG_SPI_FLASH
-#define CONFIG_SPI_FLASH_SPANSION
+#define CONFIG_SF_DATAFLASH
+#endif
 #endif
 
 /*