mtd: OneNAND: allow board init function fail

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>

diff --git a/board/micronas/vct/ebi_onenand.c b/board/micronas/vct/ebi_onenand.c
index 62eb648..ef892ca 100644 (file)
--- a/board/micronas/vct/ebi_onenand.c
+++ b/board/micronas/vct/ebi_onenand.c
@@ -169,7 +169,7 @@ static int ebi_write_bufferram(struct mtd_info *mtd, loff_t addr, int area,
        return 0;
 }
 
-void onenand_board_init(struct mtd_info *mtd)
+int onenand_board_init(struct mtd_info *mtd)
 {
        struct onenand_chip *chip = mtd->priv;
 
@@ -181,4 +181,6 @@ void onenand_board_init(struct mtd_info *mtd)
 
        chip->read_bufferram = ebi_read_bufferram;
        chip->write_bufferram = ebi_write_bufferram;
+
+       return 0;
 }

diff --git a/board/samsung/goni/onenand.c b/board/samsung/goni/onenand.c
index b74d8e8..cbe1d12 100644 (file)
--- a/board/samsung/goni/onenand.c
+++ b/board/samsung/goni/onenand.c
@@ -11,11 +11,13 @@
 #include <linux/mtd/samsung_onenand.h>
 #include <onenand_uboot.h>
 
-void onenand_board_init(struct mtd_info *mtd)
+int onenand_board_init(struct mtd_info *mtd)
 {
        struct onenand_chip *this = mtd->priv;
 
        this->base = (void *)CONFIG_SYS_ONENAND_BASE;
        this->options |= ONENAND_RUNTIME_BADBLOCK_CHECK;
        this->chip_probe = s5pc110_chip_probe;
+
+       return 0;
 }

diff --git a/board/samsung/smdkc100/onenand.c b/board/samsung/smdkc100/onenand.c
index 577c1a5..994d91d 100644 (file)
--- a/board/samsung/smdkc100/onenand.c
+++ b/board/samsung/smdkc100/onenand.c
@@ -16,7 +16,7 @@
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 
-void onenand_board_init(struct mtd_info *mtd)
+int onenand_board_init(struct mtd_info *mtd)
 {
        struct onenand_chip *this = mtd->priv;
        struct s5pc100_clock *clk =
@@ -65,4 +65,6 @@ void onenand_board_init(struct mtd_info *mtd)
        writel(value, &onenand->int_err_mask);
 
        s3c_onenand_init(mtd);
+
+       return 0;
 }

diff --git a/board/samsung/universal_c210/onenand.c b/board/samsung/universal_c210/onenand.c
index 28bc811..147a95e 100644 (file)
--- a/board/samsung/universal_c210/onenand.c
+++ b/board/samsung/universal_c210/onenand.c
@@ -10,11 +10,13 @@
 #include <linux/mtd/onenand.h>
 #include <linux/mtd/samsung_onenand.h>
 
-void onenand_board_init(struct mtd_info *mtd)
+int onenand_board_init(struct mtd_info *mtd)
 {
        struct onenand_chip *this = mtd->priv;
 
        this->base = (void *)CONFIG_SYS_ONENAND_BASE;
        this->options |= ONENAND_RUNTIME_BADBLOCK_CHECK;
        this->chip_probe = s5pc210_chip_probe;
+
+       return 0;
 }

diff --git a/drivers/mtd/onenand/onenand_uboot.c b/drivers/mtd/onenand/onenand_uboot.c
index ae60c3b..c15ec9d 100644 (file)
--- a/drivers/mtd/onenand/onenand_uboot.c
+++ b/drivers/mtd/onenand/onenand_uboot.c
@@ -24,33 +24,33 @@ static __attribute__((unused)) char dev_name[] = "onenand0";
 
 void onenand_init(void)
 {
+       int err = 0;
        memset(&onenand_mtd, 0, sizeof(struct mtd_info));
        memset(&onenand_chip, 0, sizeof(struct onenand_chip));
 
        onenand_mtd.priv = &onenand_chip;
 
 #ifdef CONFIG_USE_ONENAND_BOARD_INIT
-       /*
-        * It's used for some board init required
-        */
-       onenand_board_init(&onenand_mtd);
+       /* It's used for some board init required */
+       err = onenand_board_init(&onenand_mtd);
 #else
        onenand_chip.base = (void *) CONFIG_SYS_ONENAND_BASE;
 #endif
 
-       onenand_scan(&onenand_mtd, 1);
+       if (!err && !(onenand_scan(&onenand_mtd, 1))) {
 
-       if (onenand_chip.device_id & DEVICE_IS_FLEXONENAND)
-               puts("Flex-");
-       puts("OneNAND: ");
-       print_size(onenand_chip.chipsize, "\n");
+               if (onenand_chip.device_id & DEVICE_IS_FLEXONENAND)
+                       puts("Flex-");
+               puts("OneNAND: ");
 
 #ifdef CONFIG_MTD_DEVICE
-       /*
-        * Add MTD device so that we can reference it later
-        * via the mtdcore infrastructure (e.g. ubi).
-        */
-       onenand_mtd.name = dev_name;
-       add_mtd_device(&onenand_mtd);
+               /*
+                * Add MTD device so that we can reference it later
+                * via the mtdcore infrastructure (e.g. ubi).
+                */
+               onenand_mtd.name = dev_name;
+               add_mtd_device(&onenand_mtd);
 #endif
+       }
+       print_size(onenand_chip.chipsize, "\n");
 }

diff --git a/include/onenand_uboot.h b/include/onenand_uboot.h
index d69e0d2..995f0aa 100644 (file)
--- a/include/onenand_uboot.h
+++ b/include/onenand_uboot.h
@@ -26,7 +26,7 @@ extern struct mtd_info onenand_mtd;
 extern struct onenand_chip onenand_chip;
 
 /* board */
-extern void onenand_board_init(struct mtd_info *);
+extern int onenand_board_init(struct mtd_info *);
 
 /* Functions */
 extern void onenand_init(void);