3af779eb17
This is a backport of the patches accepted to the Linux mainline related to mvebu SoC (Armada XP and Armada 370) between Linux v3.11, and Linux v3.12. This work mainly covers: * Ground work for sharing the pxa nand driver(drivers/mtd/nand/pxa3xx_nand.c) between the PXA family,and the Armada family. * Further updates to the mvebu MBus. * Work and ground work for enabling MSI on the Armada family. * some phy / mdio bus initialization related work. * Device tree binding documentation update. Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com> CC: Luka Perkov <luka@openwrt.org> SVN-Revision: 39565
49 lines
1.5 KiB
Diff
49 lines
1.5 KiB
Diff
From be5f1d59341e48dbe0730253417c52bf79c6c3a7 Mon Sep 17 00:00:00 2001
|
|
From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Date: Mon, 12 Aug 2013 14:14:49 -0300
|
|
Subject: [PATCH 116/203] mtd: nand: pxa3xx: Allow to set/clear the 'spare
|
|
enable' field
|
|
|
|
Some commands (such as the ONFI parameter page read) need to
|
|
clear the 'spare enable' bit. This commit allows to set/clear
|
|
depending on the prepared command, instead of having it always
|
|
set.
|
|
|
|
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>
|
|
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
|
|
---
|
|
drivers/mtd/nand/pxa3xx_nand.c | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
--- a/drivers/mtd/nand/pxa3xx_nand.c
|
|
+++ b/drivers/mtd/nand/pxa3xx_nand.c
|
|
@@ -185,6 +185,7 @@ struct pxa3xx_nand_info {
|
|
int cs;
|
|
int use_ecc; /* use HW ECC ? */
|
|
int use_dma; /* use DMA ? */
|
|
+ int use_spare; /* use spare ? */
|
|
int is_ready;
|
|
|
|
unsigned int page_size; /* page size of attached chip */
|
|
@@ -325,6 +326,11 @@ static void pxa3xx_nand_start(struct pxa
|
|
else
|
|
ndcr &= ~NDCR_DMA_EN;
|
|
|
|
+ if (info->use_spare)
|
|
+ ndcr |= NDCR_SPARE_EN;
|
|
+ else
|
|
+ ndcr &= ~NDCR_SPARE_EN;
|
|
+
|
|
ndcr |= NDCR_ND_RUN;
|
|
|
|
/* clear status bits and run */
|
|
@@ -526,6 +532,7 @@ static int prepare_command_pool(struct p
|
|
info->buf_count = 0;
|
|
info->oob_size = 0;
|
|
info->use_ecc = 0;
|
|
+ info->use_spare = 1;
|
|
info->use_dma = (use_dma) ? 1 : 0;
|
|
info->is_ready = 0;
|
|
info->retcode = ERR_NONE;
|