c9ae111a20
This is a backport of the patches accepted to the Linux mainline related to mvebu SoC (Armada XP and Armada 370) between Linux v3.12, and Linux v3.13. This work mainly covers: * Finishes work for sharing the pxa nand driver(drivers/mtd/nand/pxa3xx_nand.c) between the PXA family, and the Armada family. * timer initialization update, and access function for the Armada family. * Generic IRQ handling backporting. * Some bug fixes. Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com> CC: Luka Perkov <luka@openwrt.org> SVN-Revision: 39566
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From 67ab922e1e292494732a10f367d3de47338639ac Mon Sep 17 00:00:00 2001
|
|
From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Date: Thu, 7 Nov 2013 12:17:15 -0300
|
|
Subject: [PATCH 136/203] mtd: nand: pxa3xx: Use chip->cmdfunc instead of the
|
|
internal
|
|
|
|
Whenever possible, it's always better to use the generic chip->cmdfunc
|
|
instead of the internal pxa3xx_nand_cmdfunc().
|
|
In this particular case, this will allow to have multiple cmdfunc()
|
|
implementations for different SoC variants.
|
|
|
|
Reviewed-by: Huang Shijie <shijie8@gmail.com>
|
|
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Tested-by: Daniel Mack <zonque@gmail.com>
|
|
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
|
|
---
|
|
drivers/mtd/nand/pxa3xx_nand.c | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/mtd/nand/pxa3xx_nand.c
|
|
+++ b/drivers/mtd/nand/pxa3xx_nand.c
|
|
@@ -1015,14 +1015,18 @@ static void pxa3xx_nand_free_buff(struct
|
|
static int pxa3xx_nand_sensing(struct pxa3xx_nand_info *info)
|
|
{
|
|
struct mtd_info *mtd;
|
|
+ struct nand_chip *chip;
|
|
int ret;
|
|
+
|
|
mtd = info->host[info->cs]->mtd;
|
|
+ chip = mtd->priv;
|
|
+
|
|
/* use the common timing to make a try */
|
|
ret = pxa3xx_nand_config_flash(info, &builtin_flash_types[0]);
|
|
if (ret)
|
|
return ret;
|
|
|
|
- pxa3xx_nand_cmdfunc(mtd, NAND_CMD_RESET, 0, 0);
|
|
+ chip->cmdfunc(mtd, NAND_CMD_RESET, 0, 0);
|
|
if (info->is_ready)
|
|
return 0;
|
|
|