Module Name: src
Committed By: ahoka
Date: Sun Mar 27 13:35:39 UTC 2011
Modified Files:
src/sys/arch/arm/omap: omap2_nand.c
Log Message:
Use nand_init_interface, which is required now.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/omap/omap2_nand.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/omap/omap2_nand.c
diff -u src/sys/arch/arm/omap/omap2_nand.c:1.1 src/sys/arch/arm/omap/omap2_nand.c:1.2
--- src/sys/arch/arm/omap/omap2_nand.c:1.1 Sat Feb 26 18:07:18 2011
+++ src/sys/arch/arm/omap/omap2_nand.c Sun Mar 27 13:35:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: omap2_nand.c,v 1.1 2011/02/26 18:07:18 ahoka Exp $ */
+/* $NetBSD: omap2_nand.c,v 1.2 2011/03/27 13:35:39 ahoka Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2_nand.c,v 1.1 2011/02/26 18:07:18 ahoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_nand.c,v 1.2 2011/03/27 13:35:39 ahoka Exp $");
#include "opt_omap.h"
#include "opt_flash.h"
@@ -249,7 +249,8 @@
panic("invalid buswidth reported by config1");
}
- sc->sc_nand_if.select = &nand_default_select;
+ nand_init_interface(&sc->sc_nand_if);
+
sc->sc_nand_if.command = &omap2_nand_command;
sc->sc_nand_if.address = &omap2_nand_address;
sc->sc_nand_if.read_buf_byte = &omap2_nand_read_buf_byte;
@@ -271,12 +272,8 @@
sc->sc_nand_if.ecc.necc_block_size = 512;
sc->sc_nand_if.ecc.necc_type = NAND_ECC_TYPE_HW;
#else
- sc->sc_nand_if.ecc_compute = &nand_default_ecc_compute;
- sc->sc_nand_if.ecc_correct = &nand_default_ecc_correct;
- sc->sc_nand_if.ecc_prepare = NULL;
sc->sc_nand_if.ecc.necc_code_size = 3;
sc->sc_nand_if.ecc.necc_block_size = 256;
- sc->sc_nand_if.ecc.necc_type = NAND_ECC_TYPE_SW;
#endif /* OMAP2_NAND_HARDWARE_ECC */
if (!pmf_device_register1(sc->sc_dev, NULL, NULL, NULL))
