Skip to contentSkip to conversation

atmel_nand: remove cpu_is_xxx() in nand driver

PATCH New Josh Wu 3 participants 5 messages May 9, 2013 – Jul 1, 2013

Subsystems (5)
Device tree bindings Memory technology devices (MTD) Arm/Microchip (AT91) SoC support NAND flash +1 more subsystems
lore
Share & tools
lore

Josh Wu

author
#0 lore raw

cover atmel_nand: remove cpu_is_xxx() in nand driver

avoid to use cpu_is_xxx() macro in driver, we use platform data and dts for the different cpu.

Josh Wu (2):
atmel_nand: at91/avr32/: Replace cpu_is_at32ap7000() with a nand
platform data
mtd: atmel_nand: add a new dt binding item for nand dma support

 .../devicetree/bindings/mtd/atmel-nand.txt         |    1 +
 arch/avr32/mach-at32ap/at32ap700x.c                |    3 +++
 drivers/mtd/nand/atmel_nand.c                      |   24 ++++++++------------
 include/linux/platform_data/atmel.h                |    4 ++++
 4 files changed, 17 insertions(+), 15 deletions(-)
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 1/2 atmel_nand: at91/avr32/: Replace cpu_is_at32ap7000() with a nand platform data

The nand driver use cpu_is_at32ap7000() macro for a workaround. For the multi-platform support, we will remove this cpu_is_xxx() macro.

This patch adds a boolean variable need_reset_workaround in structure atmel_nand_data. Using this variable we can remove cpu_is_at32ap7000() macro.

Signed-off-by Josh Wu <[email protected]>
Cc Hans-Christian Egtvedt <[email protected]>
---
 arch/avr32/mach-at32ap/at32ap700x.c |    3 +++
 drivers/mtd/nand/atmel_nand.c       |   13 ++++++-------
 include/linux/platform_data/atmel.h |    3 +++
 3 files changed, 12 insertions(+), 7 deletions(-)
arch/avr32/mach-at32ap/at32ap700x.c +3 -0
index b323d8d..697ef58 100644
@@ -1979,6 +1979,9 @@ at32_add_device_nand(unsigned int id, struct atmel_nand_data *data)
 				ARRAY_SIZE(smc_cs3_resource)))
 		goto fail;
 
+	/* For at32ap7000, we use the reset workaround for nand driver */
+	data->need_reset_workaround = true;
+
 	if (platform_device_add_data(pdev, data,
 				sizeof(struct atmel_nand_data)))
 		goto fail;
drivers/mtd/nand/atmel_nand.c +6 -7
index 2d23d29..7bf912b 100644
@@ -1174,10 +1174,9 @@ static int atmel_nand_read_page(struct mtd_info *mtd, struct nand_chip *chip,
 	 * Workaround: Reset the parity registers before reading the
 	 * actual data.
 	 */
-	if (cpu_is_at32ap7000()) {
-		struct atmel_nand_host *host = chip->priv;
+	struct atmel_nand_host *host = chip->priv;
+	if (host->board.need_reset_workaround)
 		ecc_writel(host->ecc, CR, ATMEL_ECC_RST);
-	}
 
 	/* read the page */
 	chip->read_buf(mtd, p, eccsize);

@@ -1298,11 +1297,11 @@ static int atmel_nand_correct(struct mtd_info *mtd, u_char *dat,
  */
 static void atmel_nand_hwctl(struct mtd_info *mtd, int mode)
 {
-	if (cpu_is_at32ap7000()) {
-		struct nand_chip *nand_chip = mtd->priv;
-		struct atmel_nand_host *host = nand_chip->priv;
+	struct nand_chip *nand_chip = mtd->priv;
+	struct atmel_nand_host *host = nand_chip->priv;
+
+	if (host->board.need_reset_workaround)
 		ecc_writel(host->ecc, CR, ATMEL_ECC_RST);
-	}
 }
 
 #if defined(CONFIG_OF)
include/linux/platform_data/atmel.h +3 -0
index 6a293b7..59f558d 100644
@@ -71,6 +71,9 @@ struct atmel_nand_data {
 	u8		on_flash_bbt;		/* bbt on flash */
 	struct mtd_partition *parts;
 	unsigned int	num_parts;
+
+	/* default is false, only for at32ap7000 chip is true */
+	bool		need_reset_workaround;
 };
 
  /* Serial */
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 1/2 atmel_nand: at91/avr32/: Replace cpu_is_at32ap7000() with a nand platform data

Quoted 8 lines · Josh Wu

The nand driver use cpu_is_at32ap7000() macro for a workaround. For the multi-platform support, we will remove this cpu_is_xxx() macro.

This patch adds a boolean variable need_reset_workaround in structure atmel_nand_data. Using this variable we can remove cpu_is_at32ap7000() macro.

Signed-off-by Josh Wu <[email protected]>
Cc Hans-Christian Egtvedt <[email protected]>
Acked-by Hans-Christian Egtvedt <[email protected]>
Quoted 5 lines
---
 arch/avr32/mach-at32ap/at32ap700x.c |    3 +++
 drivers/mtd/nand/atmel_nand.c       |   13 ++++++-------
 include/linux/platform_data/atmel.h |    3 +++
 3 files changed, 12 insertions(+), 7 deletions(-)

Feel free to push this through the mtd tree, if they won't accept it I'm working on getting my workflow up on the linux-avr32.git tree.

<snipp diff>

Signature · 1 line
HcE
author
#3 lore raw

PATCH 2/2 mtd: atmel_nand: add a new dt binding item for nand dma support

In reply to Josh Wu

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 <[email protected]>
---
 .../devicetree/bindings/mtd/atmel-nand.txt         |    1 +
 drivers/mtd/nand/atmel_nand.c                      |   11 +++--------
 include/linux/platform_data/atmel.h                |    1 +
 3 files changed, 5 insertions(+), 8 deletions(-)
Documentation/devicetree/bindings/mtd/atmel-nand.txt +1 -0
index d555421..b6eb484 100644
@@ -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".
drivers/mtd/nand/atmel_nand.c +3 -8
index 7bf912b..61d3869 100644
@@ -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) {
include/linux/platform_data/atmel.h +1 -0
index 59f558d..cea9f70 100644
@@ -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;
Signature · 1 line
1.7.9.5
#4 lore raw

cover atmel_nand: remove cpu_is_xxx() in nand driver

In reply to Josh Wu
Quoted 7 lines · Josh Wu

avoid to use cpu_is_xxx() macro in driver, we use platform data and dts for the different cpu.

Josh Wu (2):
atmel_nand: at91/avr32/: Replace cpu_is_at32ap7000() with a nand
platform data
mtd: atmel_nand: add a new dt binding item for nand dma support

Pushed these 2 to l2-mtd.git, thanks!

Signature · 2 lines
Best Regards,
Artem Bityutskiy