diff options
| author |  Josh Wu <josh.wu@atmel.com>
| 2013-05-09 15:34:55 +0800 |
|---|---|---|
| committer |  David Woodhouse <David.Woodhouse@intel.com>
| 2013-08-05 20:56:15 +0100 |
| commit | 1b7192658a08f70df0f290634fd7cd2ecb629fc9 (patch) | |
| tree | bc6bccfafb2ff417638d8161fd188b4b3cf1e07d | |
| parent | mtd: atmel_nand: replace cpu_is_at32ap7000() with a nand platform data (diff) | |
| download | linux-1b7192658a08f70df0f290634fd7cd2ecb629fc9.tar.gz linux-1b7192658a08f70df0f290634fd7cd2ecb629fc9.tar.bz2 linux-1b7192658a08f70df0f290634fd7cd2ecb629fc9.zip | |
mtd: atmel_nand: add a new dt binding item for nand dma support
This patch will set the nand dma support in dts. Since we will not use
cpu_is_xxx() in nand driver. We needn't include the mach/cpu.h any more.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| -rw-r--r-- | Documentation/devicetree/bindings/mtd/atmel-nand.txt | 1 | ||||
| -rw-r--r-- | drivers/mtd/nand/atmel_nand.c | 11 | ||||
| -rw-r--r-- | include/linux/platform_data/atmel.h | 1 |
3 files changed, 5 insertions, 8 deletions
diff --git a/Documentation/devicetree/bindings/mtd/atmel-nand.txt b/Documentation/devicetree/bindings/mtd/atmel-nand.txt index d555421ea49f..b6eb484366a5 100644 --- a/Documentation/devicetree/bindings/mtd/atmel-nand.txt +++ b/Documentation/devicetree/bindings/mtd/atmel-nand.txt @@ -15,6 +15,7 @@ Required properties: optional gpio and may be set to 0 if not present. Optional properties: +- atmel,nand-has-dma : boolean to support dma transfer for nand read/write. - nand-ecc-mode : String, operation mode of the NAND ecc mode, soft by default. Supported values are: "none", "soft", "hw", "hw_syndrome", "hw_oob_first", "soft_bch". diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index 7bf912b5b969..61d38697986e 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c @@ -43,8 +43,6 @@ #include <linux/platform_data/atmel.h> #include <linux/pinctrl/consumer.h> -#include <mach/cpu.h> - static int use_dma = 1; module_param(use_dma, int, 0); @@ -128,11 +126,6 @@ struct atmel_nand_host { static struct nand_ecclayout atmel_pmecc_oobinfo; -static int cpu_has_dma(void) -{ - return cpu_is_at91sam9rl() || cpu_is_at91sam9g45(); -} - /* * Enable NAND. */ @@ -1336,6 +1329,8 @@ static int atmel_of_init_port(struct atmel_nand_host *host, board->on_flash_bbt = of_get_nand_on_flash_bbt(np); + board->has_dma = of_property_read_bool(np, "atmel,nand-has-dma"); + if (of_get_nand_bus_width(np) == 16) board->bus_width_16 = 1; @@ -1600,7 +1595,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev) nand_chip->bbt_options |= NAND_BBT_USE_FLASH; } - if (!cpu_has_dma()) + if (!host->board.has_dma) use_dma = 0; if (use_dma) { diff --git a/include/linux/platform_data/atmel.h b/include/linux/platform_data/atmel.h index 59f558d9b81e..cea9f70133c5 100644 --- a/include/linux/platform_data/atmel.h +++ b/include/linux/platform_data/atmel.h @@ -71,6 +71,7 @@ struct atmel_nand_data { u8 on_flash_bbt; /* bbt on flash */ struct mtd_partition *parts; unsigned int num_parts; + bool has_dma; /* support dma transfer */ /* default is false, only for at32ap7000 chip is true */ bool need_reset_workaround; |