lua: Fixed some cross-platform issues for PPC (and probably other architectures)

[openwrt.git] / target / linux / rb532 / files / arch / mips / rb500 / devices.c

diff --git a/target/linux/rb532/files/arch/mips/rb500/devices.c b/target/linux/rb532/files/arch/mips/rb500/devices.c
index d8342fe..6372737 100644 (file)
--- a/target/linux/rb532/files/arch/mips/rb500/devices.c
+++ b/target/linux/rb532/files/arch/mips/rb500/devices.c
@@ -22,6 +22,10 @@
 #include <linux/mtd/nand.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
+#include <linux/gpio_keys.h>
+#include <linux/input.h>
+
+#include <asm/bootinfo.h>
 
 #include <asm/rc32434/rc32434.h>
 #include <asm/rc32434/dma.h>
@@ -126,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;
@@ -151,7 +168,7 @@ void rb500_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
 }
 
 static struct resource nand_slot0_res[] = {
-       {
+       [0] = {
                .name = "nand_membase",
                .flags = IORESOURCE_MEM
        }
@@ -163,8 +180,8 @@ struct platform_nand_data rb500_nand_data = {
 };
 
 static struct platform_device nand_slot0 = {
-       .id = 0,
        .name = "gen_nand",
+       .id = -1,
        .resource = nand_slot0_res,
        .num_resources = ARRAY_SIZE(nand_slot0_res),
        .dev.platform_data = &rb500_nand_data,
@@ -182,11 +199,39 @@ static struct mtd_partition rb500_partition_info[] = {
        }
 };
 
+static struct platform_device rb500_led = {
+       .name = "rb500-led",
+       .id = 0,
+};
+
+static struct gpio_keys_button rb500_gpio_btn[] = {
+       {
+               .gpio = 1,
+               .code = BTN_0,
+               .desc = "S1",
+               .active_low = 1,
+       }
+};
+
+static struct gpio_keys_platform_data rb500_gpio_btn_data = {
+       .buttons = rb500_gpio_btn,
+       .nbuttons = ARRAY_SIZE(rb500_gpio_btn),
+};
+
+static struct platform_device rb500_button = {
+       .name   = "gpio-keys",
+       .id     = -1,
+       .dev    = {
+               .platform_data = &rb500_gpio_btn_data,
+       }
+};
 
 static struct platform_device *rb500_devs[] = {
        &korina_dev0,
        &nand_slot0,
-       &cf_slot0
+       &cf_slot0,
+       &rb500_led,
+       &rb500_button
 };
 
 static void __init parse_mac_addr(char *macstr)
@@ -228,12 +273,35 @@ 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)
 {
-       if (!strcmp(board_type, "500r5"))
+       switch (mips_machtype) {
+       case MACH_MIKROTIK_RB532A:
                changeLatchU5(LO_FOFF | LO_CEX, LO_ULED | LO_ALE | LO_CLE | LO_WPX);
-        else
+               break;
+       default:
                changeLatchU5(LO_WPX | LO_FOFF | LO_CEX, LO_ULED | LO_ALE | LO_CLE);
+               break;
+       }
+
+       /* Setup NAND specific settings */
+       rb500_nand_data.chip.nr_chips = 1;
+       rb500_nand_data.chip.nr_partitions = ARRAY_SIZE(rb500_partition_info);
+       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;
 }
 
 
@@ -248,19 +316,12 @@ static int __init plat_setup_devices(void)
                cf_slot0_res[0].end = cf_slot0_res[0].start + 0x1000;
        }
 
-       /* Initialise the NAND device */
-       rb500_nand_setup();
-
        /* Read the NAND resources from the device controller */
        nand_slot0_res[0].start = readl(CFG_DC_DEV2 + CFG_DC_DEVBASE);
        nand_slot0_res[0].end = nand_slot0_res[0].start + 0x1000;
 
-       /* Setup NAND specific settings */
-       rb500_nand_data.chip.nr_chips = 1;
-       rb500_nand_data.chip.nr_partitions = ARRAY_SIZE(rb500_partition_info);
-       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;
+       /* Initialise the NAND device */
+       rb500_nand_setup();
 
        return platform_add_devices(rb500_devs, ARRAY_SIZE(rb500_devs));
 }