ar71xx: restore rb4xx kernel partition size to the original value

[librecmc/librecmc.git] / target / linux / ar71xx / files / drivers / mtd / nand / rb4xx_nand.c

diff --git a/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c b/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c
index 664f7dfcc0d0c23bf168134dc9494633a6a9a296..a007484b2e76c83c9b96c4be7f7b723d626e9c8d 100644 (file)
--- a/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c
+++ b/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c
@@ -12,6 +12,8 @@
  *  by the Free Software Foundation.
  */
 
+#include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/mtd.h>
@@ -22,8 +24,8 @@
 #include <linux/gpio.h>
 #include <linux/slab.h>
 
-#include <asm/mach-ar71xx/ar71xx.h>
-#include <asm/mach-ar71xx/rb4xx_cpld.h>
+#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/rb4xx_cpld.h>
 
 #define DRV_NAME        "rb4xx-nand"
 #define DRV_VERSION     "0.2.0"
@@ -60,7 +62,7 @@ static struct mtd_partition rb4xx_nand_partitions[] = {
        {
                .name   = "kernel",
                .offset = (256 * 1024),
-               .size   = (6 * 1024 * 1024) - (256 * 1024),
+               .size   = (4 * 1024 * 1024) - (256 * 1024),
        },
        {
                .name   = "rootfs",
@@ -134,7 +136,7 @@ static void rb4xx_nand_read_buf(struct mtd_info *mtd, unsigned char *buf,
                pr_err("rb4xx_nand: read buf failed, err=%d\n", err);
 }
 
-static int __init rb4xx_nand_probe(struct platform_device *pdev)
+static int __devinit rb4xx_nand_probe(struct platform_device *pdev)
 {
        struct rb4xx_nand_info  *info;
        int ret;
@@ -219,7 +221,6 @@ static int __init rb4xx_nand_probe(struct platform_device *pdev)
 
        info->chip.chip_delay   = 25;
        info->chip.ecc.mode     = NAND_ECC_SOFT;
-       info->chip.options      |= NAND_NO_AUTOINCR;
 
        platform_set_drvdata(pdev, info);
 
@@ -238,12 +239,8 @@ static int __init rb4xx_nand_probe(struct platform_device *pdev)
                goto err_set_drvdata;
        }
 
-#ifdef CONFIG_MTD_PARTITIONS
-       ret = add_mtd_partitions(&info->mtd, rb4xx_nand_partitions,
+       mtd_device_register(&info->mtd, rb4xx_nand_partitions,
                                ARRAY_SIZE(rb4xx_nand_partitions));
-#else
-       ret = add_mtd_device(&info->mtd);
-#endif
        if (ret)
                goto err_release_nand;