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
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From 2a1254f505ca4d376eae81768e4d5d890b578d13 Mon Sep 17 00:00:00 2001
|
|
From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Date: Thu, 14 Nov 2013 18:25:27 -0300
|
|
Subject: [PATCH 141/203] mtd: nand: pxa3xx: Use waitfunc() to wait for the
|
|
device to be ready
|
|
|
|
In pxa3xx_nand_sensing() instead of simply using info->is_ready
|
|
after issuing a command, the correct way of checking is to wait
|
|
for the device to be ready through the chip's waitfunc().
|
|
|
|
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 | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/mtd/nand/pxa3xx_nand.c
|
|
+++ b/drivers/mtd/nand/pxa3xx_nand.c
|
|
@@ -1040,10 +1040,11 @@ static int pxa3xx_nand_sensing(struct px
|
|
return ret;
|
|
|
|
chip->cmdfunc(mtd, NAND_CMD_RESET, 0, 0);
|
|
- if (!info->need_wait)
|
|
- return 0;
|
|
+ ret = chip->waitfunc(mtd, chip);
|
|
+ if (ret & NAND_STATUS_FAIL)
|
|
+ return -ENODEV;
|
|
|
|
- return -ENODEV;
|
|
+ return 0;
|
|
}
|
|
|
|
static int pxa3xx_nand_scan(struct mtd_info *mtd)
|