summaryrefslogtreecommitdiffstats
path: root/target/linux/rb532
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-06-06 09:04:14 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-06-06 09:04:14 +0000
commit70cc333f243e759bd07a83d22a42757dfec6dabc (patch)
tree23c2f63166d48aa9a7c95b19a57a02f846a5f2bf /target/linux/rb532
parentdda1223b58a63b1507e663dc3fffa49298de602a (diff)
[rb532] make use the chip_fixup function of the plat_nand driver
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11377 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/rb532')
-rw-r--r--target/linux/rb532/files/arch/mips/rb500/devices.c25
1 files changed, 25 insertions, 0 deletions
diff --git a/target/linux/rb532/files/arch/mips/rb500/devices.c b/target/linux/rb532/files/arch/mips/rb500/devices.c
index f2a6f7d9f..6372737de 100644
--- a/target/linux/rb532/files/arch/mips/rb500/devices.c
+++ b/target/linux/rb532/files/arch/mips/rb500/devices.c
@@ -130,6 +130,19 @@ static struct platform_device cf_slot0 = {
};
/* Resources and device for NAND. There is no data needed and no irqs, so just define the memory used. */
+
+/*
+ * 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 rb500_nand_ecclayout = {
+ .eccbytes = 6,
+ .eccpos = { 8, 9, 10, 13, 14, 15 },
+ .oobavail = 9,
+ .oobfree = { { 0, 4 }, { 6, 2 }, { 11, 2 }, { 4, 1 } }
+};
+
int rb500_dev_ready(struct mtd_info *mtd)
{
return MEM32(IDT434_REG_BASE + GPIOD) & GPIO_RDY;
@@ -260,6 +273,16 @@ static void __init parse_mac_addr(char *macstr)
/* NAND definitions */
#define NAND_CHIP_DELAY 25
+static int rb500_nand_fixup(struct mtd_info *mtd)
+{
+ struct nand_chip *chip = mtd->priv;
+
+ if (mtd->writesize == 512)
+ chip->ecc.layout = &rb500_nand_ecclayout;
+
+ return 0;
+}
+
static void __init rb500_nand_setup(void)
{
switch (mips_machtype) {
@@ -277,6 +300,8 @@ static void __init rb500_nand_setup(void)
rb500_nand_data.chip.partitions = rb500_partition_info;
rb500_nand_data.chip.chip_delay = NAND_CHIP_DELAY;
rb500_nand_data.chip.options = NAND_NO_AUTOINCR;
+
+ rb500_nand_data.chip.chip_fixup = &rb500_nand_fixup;
}