[rb532] add support for 2.6.32

[openwrt-10.03/.git] / target / linux / rb532 / patches / 002-rb532_nand_fixup.patch

diff --git a/target/linux/rb532/patches/002-rb532_nand_fixup.patch b/target/linux/rb532/patches/002-rb532_nand_fixup.patch
deleted file mode 100644 (file)
index 82c1912..0000000
--- a/target/linux/rb532/patches/002-rb532_nand_fixup.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/arch/mips/rb532/devices.c
-+++ b/arch/mips/rb532/devices.c
-@@ -140,6 +140,19 @@ static struct platform_device cf_slot0 =
- };
- 
- /* Resources and device for NAND */
-+
-+/*
-+ * We need to use the OLD Yaffs-1 OOB layout, otherwise the RB bootloader
-+ * will not be able to find the kernel that we load.  So set the oobinfo
-+ * when creating the partitions
-+ */
-+static struct nand_ecclayout rb532_nand_ecclayout = {
-+      .eccbytes       = 6,
-+      .eccpos         = { 8, 9, 10, 13, 14, 15 },
-+      .oobavail       = 9,
-+      .oobfree        = { { 0, 4 }, { 6, 2 }, { 11, 2 }, { 4, 1 } }
-+};
-+
- static int rb532_dev_ready(struct mtd_info *mtd)
- {
-       return gpio_get_value(GPIO_RDY);
-@@ -281,6 +294,16 @@ static void __init parse_mac_addr(char *
- /* NAND definitions */
- #define NAND_CHIP_DELAY       25
- 
-+static int rb532_nand_fixup(struct mtd_info *mtd)
-+{
-+      struct nand_chip *chip = mtd->priv;
-+
-+      if (mtd->writesize == 512)
-+              chip->ecc.layout = &rb532_nand_ecclayout;
-+
-+      return 0;
-+}
-+
- static void __init rb532_nand_setup(void)
- {
-       switch (mips_machtype) {
-@@ -300,6 +323,8 @@ static void __init rb532_nand_setup(void
-       rb532_nand_data.chip.partitions = rb532_partition_info;
-       rb532_nand_data.chip.chip_delay = NAND_CHIP_DELAY;
-       rb532_nand_data.chip.options = NAND_NO_AUTOINCR;
-+      
-+      rb532_nand_data.chip.chip_fixup = &rb532_nand_fixup;
- }
- 
-