projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'rmobile' of git://git.denx.de/u-boot-sh
[oweals/u-boot.git]
/
drivers
/
mtd
/
nand
/
lpc32xx_nand_slc.c
diff --git
a/drivers/mtd/nand/lpc32xx_nand_slc.c
b/drivers/mtd/nand/lpc32xx_nand_slc.c
index 2e5f1396061008282407159724c5ffa748f8a312..f7e27b39ce913a0639d3404c4452591d2e9e2bb0 100644
(file)
--- a/
drivers/mtd/nand/lpc32xx_nand_slc.c
+++ b/
drivers/mtd/nand/lpc32xx_nand_slc.c
@@
-15,7
+15,7
@@
#include <common.h>
#include <nand.h>
#include <linux/mtd/nand_ecc.h>
#include <common.h>
#include <nand.h>
#include <linux/mtd/nand_ecc.h>
-#include <
asm
/errno.h>
+#include <
linux
/errno.h>
#include <asm/io.h>
#include <asm/arch/config.h>
#include <asm/arch/clk.h>
#include <asm/io.h>
#include <asm/arch/config.h>
#include <asm/arch/clk.h>
@@
-291,7
+291,7
@@
static void lpc32xx_nand_dma_configure(struct nand_chip *chip,
static void lpc32xx_nand_xfer(struct mtd_info *mtd, const u8 *buf,
int len, int read)
{
static void lpc32xx_nand_xfer(struct mtd_info *mtd, const u8 *buf,
int len, int read)
{
- struct nand_chip *chip = mtd
->priv
;
+ struct nand_chip *chip = mtd
_to_nand(mtd)
;
u32 config;
int ret;
u32 config;
int ret;
@@
-486,7
+486,8
@@
static int lpc32xx_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
/* Reuse the logic from "nand_write_page_hwecc()" */
static int lpc32xx_write_page_hwecc(struct mtd_info *mtd,
struct nand_chip *chip,
/* Reuse the logic from "nand_write_page_hwecc()" */
static int lpc32xx_write_page_hwecc(struct mtd_info *mtd,
struct nand_chip *chip,
- const uint8_t *buf, int oob_required)
+ const uint8_t *buf, int oob_required,
+ int page)
{
int i;
uint8_t *ecc_calc = chip->buffers->ecccalc;
{
int i;
uint8_t *ecc_calc = chip->buffers->ecccalc;
@@
-516,7
+517,7
@@
static int lpc32xx_write_page_hwecc(struct mtd_info *mtd,
/*
* LPC32xx has only one SLC NAND controller, don't utilize
* CONFIG_SYS_NAND_SELF_INIT to be able to reuse this function
/*
* LPC32xx has only one SLC NAND controller, don't utilize
* CONFIG_SYS_NAND_SELF_INIT to be able to reuse this function
- * both in SPL NAND and U-
b
oot images.
+ * both in SPL NAND and U-
B
oot images.
*/
int board_nand_init(struct nand_chip *lpc32xx_chip)
{
*/
int board_nand_init(struct nand_chip *lpc32xx_chip)
{