spear13xx: Use dma/word access for NAND based on platform
Subsystems (3)
PATCH 19/19 spear13xx: Use dma/word access for NAND based on platform
In reply to a message not in the archiveSigned-off-by Vipin Kumar <[email protected]>
Reviewed-by Viresh Kumar <[email protected]>
--- arch/arm/mach-spear13xx/include/mach/generic.h | 2 ++ arch/arm/mach-spear13xx/r1801e.c | 3 +++ arch/arm/mach-spear13xx/spear1300_evb.c | 3 +++ arch/arm/mach-spear13xx/spear1310_evb.c | 3 +++ arch/arm/mach-spear13xx/spear1310_reva_evb.c | 3 +++ arch/arm/mach-spear13xx/spear1340_evb.c | 3 +++ arch/arm/mach-spear13xx/spear1340_lcad.c | 3 +++ arch/arm/mach-spear13xx/spear13xx.c | 12 ++++++++++++ arch/arm/mach-spear13xx/spear900_evb.c | 3 +++ arch/arm/mach-spear13xx/spear_hurricane_board.c | 3 +++ arch/arm/mach-spear3xx/spear300_evb.c | 1 + arch/arm/mach-spear3xx/spear310_evb.c | 1 + arch/arm/mach-spear3xx/spear320_evb.c | 1 + arch/arm/mach-spear3xx/spear320_hmi.c | 1 + arch/arm/mach-spear6xx/spear600_evb.c | 1 + 15 files changed, 43 insertions(+), 0 deletions(-)
arch/arm/mach-spear13xx/include/mach/generic.h +2 -0
@@ -500,6 +500,8 @@ extern struct sys_timer spear13xx_timer;/* Add spear13xx structure declarations here */ extern struct dw_dma_slave cf_dma_priv; +extern struct dw_dma_slave nand_read_dma_priv; +extern struct dw_dma_slave nand_write_dma_priv;/* Add spear13xx family function declarations here */ bool dw_dma_filter (struct dma_chan *chan,void *slave);
arch/arm/mach-spear13xx/r1801e.c +3 -0
@@ -227,6 +227,9 @@ static const struct fsmc_nand_platform_data nand_plat_data __initconst = { .cle_off = PLAT_NAND_CLE, .partitions = partition_info, .nr_partitions = ARRAY_SIZE(partition_info), + .mode = USE_DMA_ACCESS, + .read_dma_priv = &nand_read_dma_priv, + .write_dma_priv = &nand_write_dma_priv, };#ifdef CONFIG_SPEAR_PCIE_REV341
arch/arm/mach-spear13xx/spear1300_evb.c +3 -0
@@ -128,6 +128,9 @@ static const struct fsmc_nand_platform_data nand_plat_data __initconst = { .width = FSMC_NAND_BW8, .ale_off = PLAT_NAND_ALE, .cle_off = PLAT_NAND_CLE, + .mode = USE_DMA_ACCESS, + .read_dma_priv = &nand_read_dma_priv, + .write_dma_priv = &nand_write_dma_priv, };#if 0
arch/arm/mach-spear13xx/spear1310_evb.c +3 -0
@@ -174,6 +174,9 @@ static const struct fsmc_nand_platform_data nand_plat_data __initconst = { .width = FSMC_NAND_BW8, .ale_off = PLAT_NAND_ALE, .cle_off = PLAT_NAND_CLE, + .mode = USE_DMA_ACCESS, + .read_dma_priv = &nand_read_dma_priv, + .write_dma_priv = &nand_write_dma_priv, };/* fsmc nor platform data */
arch/arm/mach-spear13xx/spear1310_reva_evb.c +3 -0
@@ -263,6 +263,9 @@ static const struct fsmc_nand_platform_data nand_plat_data __initconst = { .width = FSMC_NAND_BW8, .ale_off = PLAT_NAND_ALE, .cle_off = PLAT_NAND_CLE, + .mode = USE_DMA_ACCESS, + .read_dma_priv = &nand_read_dma_priv, + .write_dma_priv = &nand_write_dma_priv, };/* fsmc nor partition info */
arch/arm/mach-spear13xx/spear1340_evb.c +3 -0
@@ -314,6 +314,9 @@ static const struct fsmc_nand_platform_data nand_plat_data __initconst = { .width = FSMC_NAND_BW8, .ale_off = PLAT_NAND_ALE, .cle_off = PLAT_NAND_CLE, + .mode = USE_DMA_ACCESS, + .read_dma_priv = &nand_read_dma_priv, + .write_dma_priv = &nand_write_dma_priv, };/* arasan compact flash controller's platform data */
arch/arm/mach-spear13xx/spear1340_lcad.c +3 -0
@@ -234,6 +234,9 @@ static const struct fsmc_nand_platform_data nand_plat_data __initconst = { .width = FSMC_NAND_BW8, .ale_off = PLAT_NAND_ALE, .cle_off = PLAT_NAND_CLE, + .mode = USE_DMA_ACCESS, + .read_dma_priv = &nand_read_dma_priv, + .write_dma_priv = &nand_write_dma_priv, };/* I2S STA529 i2c board info */
arch/arm/mach-spear13xx/spear13xx.c +12 -0
@@ -524,6 +524,18 @@ void nand_select_bank(u32 bank, u32 busw)writel (fsmc_cfg,VA_FSMC_CFG ); } +struct dw_dma_slave nand_read_dma_priv = { + .dma_dev = &spear13xx_dmac_device[0 ].dev, + .src_master =SPEAR13XX_DMA_MASTER_FSMC , + .dst_master =SPEAR13XX_DMA_MASTER_MEMORY , +}; + +struct dw_dma_slave nand_write_dma_priv = { + .dma_dev = &spear13xx_dmac_device[0 ].dev, + .src_master =SPEAR13XX_DMA_MASTER_MEMORY , + .dst_master =SPEAR13XX_DMA_MASTER_FSMC , +}; +static struct resource nand_resources[] = { { .name ="nand_data" ,
arch/arm/mach-spear13xx/spear900_evb.c +3 -0
@@ -130,6 +130,9 @@ static const struct fsmc_nand_platform_data nand_plat_data __initconst = { .width = FSMC_NAND_BW8, .ale_off = PLAT_NAND_ALE, .cle_off = PLAT_NAND_CLE, + .mode = USE_DMA_ACCESS, + .read_dma_priv = &nand_read_dma_priv, + .write_dma_priv = &nand_write_dma_priv, };#if 0
arch/arm/mach-spear13xx/spear_hurricane_board.c +3 -0
@@ -222,6 +222,9 @@ static const struct fsmc_nand_platform_data nand_plat_data __initconst = { .width = FSMC_NAND_BW8, .ale_off = PLAT_NAND_ALE, .cle_off = PLAT_NAND_CLE, + .mode = USE_DMA_ACCESS, + .read_dma_priv = &nand_read_dma_priv, + .write_dma_priv = &nand_write_dma_priv, };static struct arasan_cf_pdata cf_pdata = {
arch/arm/mach-spear3xx/spear300_evb.c +1 -0
@@ -119,6 +119,7 @@ static const struct fsmc_nand_platform_data nand0_plat_data __initconst = { .width = FSMC_NAND_BW8, .ale_off = SPEAR300_PLAT_NAND_ALE, .cle_off = SPEAR300_PLAT_NAND_CLE, + .mode = USE_WORD_ACCESS, };/* keyboard specific platform data */
arch/arm/mach-spear3xx/spear310_evb.c +1 -0
@@ -194,6 +194,7 @@ static const struct fsmc_nand_platform_data nand_plat_data __initconst = { .width = FSMC_NAND_BW8, .ale_off = SPEAR310_PLAT_NAND_ALE, .cle_off = SPEAR310_PLAT_NAND_CLE, + .mode = USE_WORD_ACCESS, };/* spi board information */
arch/arm/mach-spear3xx/spear320_evb.c +1 -0
@@ -174,6 +174,7 @@ static const struct fsmc_nand_platform_data nand_plat_data __initconst = { .width = FSMC_NAND_BW8, .ale_off = SPEAR320_PLAT_NAND_ALE, .cle_off = SPEAR320_PLAT_NAND_CLE, + .mode = USE_WORD_ACCESS, };/* Currently no gpios are free on eval board so it is kept commented */
arch/arm/mach-spear3xx/spear320_hmi.c +1 -0
@@ -155,6 +155,7 @@ static const struct fsmc_nand_platform_data nand_plat_data __initconst = { .width = FSMC_NAND_BW8, .ale_off = SPEAR320_PLAT_NAND_ALE, .cle_off = SPEAR320_PLAT_NAND_CLE, + .mode = USE_WORD_ACCESS, };static void __init spear320_hmi_init (void )
arch/arm/mach-spear6xx/spear600_evb.c +1 -0
@@ -90,6 +90,7 @@ static const struct fsmc_nand_platform_data nand_plat_data __initconst = { .width = FSMC_NAND_BW8, .ale_off = PLAT_NAND_ALE, .cle_off = PLAT_NAND_CLE, + .mode = USE_WORD_ACCESS, };/* spi board information */
Signature · 1 line
1.7.0.4
ignore this patch...sent by mistake
Regards
Vipin
Quoted 228 lines · Vipin KUMAR
Signed-off-by Vipin Kumar<[email protected]>Reviewed-by Viresh Kumar<[email protected]>--- arch/arm/mach-spear13xx/include/mach/generic.h | 2 ++ arch/arm/mach-spear13xx/r1801e.c | 3 +++ arch/arm/mach-spear13xx/spear1300_evb.c | 3 +++ arch/arm/mach-spear13xx/spear1310_evb.c | 3 +++ arch/arm/mach-spear13xx/spear1310_reva_evb.c | 3 +++ arch/arm/mach-spear13xx/spear1340_evb.c | 3 +++ arch/arm/mach-spear13xx/spear1340_lcad.c | 3 +++ arch/arm/mach-spear13xx/spear13xx.c | 12 ++++++++++++ arch/arm/mach-spear13xx/spear900_evb.c | 3 +++ arch/arm/mach-spear13xx/spear_hurricane_board.c | 3 +++ arch/arm/mach-spear3xx/spear300_evb.c | 1 + arch/arm/mach-spear3xx/spear310_evb.c | 1 + arch/arm/mach-spear3xx/spear320_evb.c | 1 + arch/arm/mach-spear3xx/spear320_hmi.c | 1 + arch/arm/mach-spear6xx/spear600_evb.c | 1 + 15 files changed, 43 insertions(+), 0 deletions(-)arch/arm/mach-spear13xx/include/mach/generic.h +2
-0@@ -500,6 +500,8 @@ extern struct sys_timer spear13xx_timer;/* Add spear13xx structure declarations here */ extern struct dw_dma_slave cf_dma_priv; +extern struct dw_dma_slave nand_read_dma_priv; +extern struct dw_dma_slave nand_write_dma_priv;/* Add spear13xx family function declarations here */ bool dw_dma_filter (struct dma_chan *chan,void *slave);arch/arm/mach-spear13xx/r1801e.c +3
-0@@ -227,6 +227,9 @@ static const struct fsmc_nand_platform_data nand_plat_data __initconst = { .cle_off = PLAT_NAND_CLE, .partitions = partition_info, .nr_partitions = ARRAY_SIZE(partition_info), + .mode = USE_DMA_ACCESS, + .read_dma_priv =&nand_read_dma_priv, + .write_dma_priv =&nand_write_dma_priv, };#ifdef CONFIG_SPEAR_PCIE_REV341 arch/arm/mach-spear13xx/spear1300_evb.c +3
-0@@ -128,6 +128,9 @@ static const struct fsmc_nand_platform_data nand_plat_data __initconst = { .width = FSMC_NAND_BW8, .ale_off = PLAT_NAND_ALE, .cle_off = PLAT_NAND_CLE, + .mode = USE_DMA_ACCESS, + .read_dma_priv =&nand_read_dma_priv, + .write_dma_priv =&nand_write_dma_priv, };#if 0 arch/arm/mach-spear13xx/spear1310_evb.c +3
-0@@ -174,6 +174,9 @@ static const struct fsmc_nand_platform_data nand_plat_data __initconst = { .width = FSMC_NAND_BW8, .ale_off = PLAT_NAND_ALE, .cle_off = PLAT_NAND_CLE, + .mode = USE_DMA_ACCESS, + .read_dma_priv =&nand_read_dma_priv, + .write_dma_priv =&nand_write_dma_priv, };/* fsmc nor platform data */ arch/arm/mach-spear13xx/spear1310_reva_evb.c +3
-0@@ -263,6 +263,9 @@ static const struct fsmc_nand_platform_data nand_plat_data __initconst = { .width = FSMC_NAND_BW8, .ale_off = PLAT_NAND_ALE, .cle_off = PLAT_NAND_CLE, + .mode = USE_DMA_ACCESS, + .read_dma_priv =&nand_read_dma_priv, + .write_dma_priv =&nand_write_dma_priv, };/* fsmc nor partition info */ arch/arm/mach-spear13xx/spear1340_evb.c +3
-0@@ -314,6 +314,9 @@ static const struct fsmc_nand_platform_data nand_plat_data __initconst = { .width = FSMC_NAND_BW8, .ale_off = PLAT_NAND_ALE, .cle_off = PLAT_NAND_CLE, + .mode = USE_DMA_ACCESS, + .read_dma_priv =&nand_read_dma_priv, + .write_dma_priv =&nand_write_dma_priv, };/* arasan compact flash controller's platform data */ arch/arm/mach-spear13xx/spear1340_lcad.c +3
-0@@ -234,6 +234,9 @@ static const struct fsmc_nand_platform_data nand_plat_data __initconst = { .width = FSMC_NAND_BW8, .ale_off = PLAT_NAND_ALE, .cle_off = PLAT_NAND_CLE, + .mode = USE_DMA_ACCESS, + .read_dma_priv =&nand_read_dma_priv, + .write_dma_priv =&nand_write_dma_priv, };/* I2S STA529 i2c board info */ arch/arm/mach-spear13xx/spear13xx.c +12
-0@@ -524,6 +524,18 @@ void nand_select_bank(u32 bank, u32 busw)writel (fsmc_cfg,VA_FSMC_CFG ); } +struct dw_dma_slave nand_read_dma_priv = { + .dma_dev =&spear13xx_dmac_device[0 ].dev, + .src_master =SPEAR13XX_DMA_MASTER_FSMC , + .dst_master =SPEAR13XX_DMA_MASTER_MEMORY , +}; + +struct dw_dma_slave nand_write_dma_priv = { + .dma_dev =&spear13xx_dmac_device[0 ].dev, + .src_master =SPEAR13XX_DMA_MASTER_MEMORY , + .dst_master =SPEAR13XX_DMA_MASTER_FSMC , +}; +static struct resource nand_resources[] = { { .name ="nand_data" ,arch/arm/mach-spear13xx/spear900_evb.c +3
-0@@ -130,6 +130,9 @@ static const struct fsmc_nand_platform_data nand_plat_data __initconst = { .width = FSMC_NAND_BW8, .ale_off = PLAT_NAND_ALE, .cle_off = PLAT_NAND_CLE, + .mode = USE_DMA_ACCESS, + .read_dma_priv =&nand_read_dma_priv, + .write_dma_priv =&nand_write_dma_priv, };#if 0 arch/arm/mach-spear13xx/spear_hurricane_board.c +3
-0@@ -222,6 +222,9 @@ static const struct fsmc_nand_platform_data nand_plat_data __initconst = { .width = FSMC_NAND_BW8, .ale_off = PLAT_NAND_ALE, .cle_off = PLAT_NAND_CLE, + .mode = USE_DMA_ACCESS, + .read_dma_priv =&nand_read_dma_priv, + .write_dma_priv =&nand_write_dma_priv, };static struct arasan_cf_pdata cf_pdata = {arch/arm/mach-spear3xx/spear300_evb.c +1
-0@@ -119,6 +119,7 @@ static const struct fsmc_nand_platform_data nand0_plat_data __initconst = { .width = FSMC_NAND_BW8, .ale_off = SPEAR300_PLAT_NAND_ALE, .cle_off = SPEAR300_PLAT_NAND_CLE, + .mode = USE_WORD_ACCESS, };/* keyboard specific platform data */ arch/arm/mach-spear3xx/spear310_evb.c +1
-0@@ -194,6 +194,7 @@ static const struct fsmc_nand_platform_data nand_plat_data __initconst = { .width = FSMC_NAND_BW8, .ale_off = SPEAR310_PLAT_NAND_ALE, .cle_off = SPEAR310_PLAT_NAND_CLE, + .mode = USE_WORD_ACCESS, };/* spi board information */ arch/arm/mach-spear3xx/spear320_evb.c +1
-0@@ -174,6 +174,7 @@ static const struct fsmc_nand_platform_data nand_plat_data __initconst = { .width = FSMC_NAND_BW8, .ale_off = SPEAR320_PLAT_NAND_ALE, .cle_off = SPEAR320_PLAT_NAND_CLE, + .mode = USE_WORD_ACCESS, };/* Currently no gpios are free on eval board so it is kept commented */ arch/arm/mach-spear3xx/spear320_hmi.c +1
-0@@ -155,6 +155,7 @@ static const struct fsmc_nand_platform_data nand_plat_data __initconst = { .width = FSMC_NAND_BW8, .ale_off = SPEAR320_PLAT_NAND_ALE, .cle_off = SPEAR320_PLAT_NAND_CLE, + .mode = USE_WORD_ACCESS, };static void __init spear320_hmi_init (void )arch/arm/mach-spear6xx/spear600_evb.c +1
-0@@ -90,6 +90,7 @@ static const struct fsmc_nand_platform_data nand_plat_data __initconst = { .width = FSMC_NAND_BW8, .ale_off = PLAT_NAND_ALE, .cle_off = PLAT_NAND_CLE, + .mode = USE_WORD_ACCESS, };/* spi board information */