Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-block.git] / arch / arm / mach-omap1 / board-ams-delta.c

diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
index d624bade266e2974ffec6a3a4034c4c7c59e2cc9..c4c0a8ea11e4d0efea0026c8668619ac1c03648f 100644 (file)
--- a/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@ -295,23 +295,13 @@ struct modem_private_data {
 
 static struct modem_private_data modem_priv;
 
-static struct resource ams_delta_nand_resources[] = {
-       [0] = {
-               .start  = OMAP1_MPUIO_BASE,
-               .end    = OMAP1_MPUIO_BASE +
-                               OMAP_MPUIO_IO_CNTL + sizeof(u32) - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-};
-
 static struct platform_device ams_delta_nand_device = {
        .name   = "ams-delta-nand",
        .id     = -1,
-       .num_resources  = ARRAY_SIZE(ams_delta_nand_resources),
-       .resource       = ams_delta_nand_resources,
 };
 
-#define OMAP_GPIO_LABEL        "gpio-0-15"
+#define OMAP_GPIO_LABEL                "gpio-0-15"
+#define OMAP_MPUIO_LABEL       "mpuio"
 
 static struct gpiod_lookup_table ams_delta_nand_gpio_table = {
        .table = {
@@ -323,6 +313,14 @@ static struct gpiod_lookup_table ams_delta_nand_gpio_table = {
                GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_NAND_NWE, "nwe", 0),
                GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_NAND_ALE, "ale", 0),
                GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_NAND_CLE, "cle", 0),
+               GPIO_LOOKUP_IDX(OMAP_MPUIO_LABEL, 0, "data", 0, 0),
+               GPIO_LOOKUP_IDX(OMAP_MPUIO_LABEL, 1, "data", 1, 0),
+               GPIO_LOOKUP_IDX(OMAP_MPUIO_LABEL, 2, "data", 2, 0),
+               GPIO_LOOKUP_IDX(OMAP_MPUIO_LABEL, 3, "data", 3, 0),
+               GPIO_LOOKUP_IDX(OMAP_MPUIO_LABEL, 4, "data", 4, 0),
+               GPIO_LOOKUP_IDX(OMAP_MPUIO_LABEL, 5, "data", 5, 0),
+               GPIO_LOOKUP_IDX(OMAP_MPUIO_LABEL, 6, "data", 6, 0),
+               GPIO_LOOKUP_IDX(OMAP_MPUIO_LABEL, 7, "data", 7, 0),
                { },
        },
 };
@@ -611,7 +609,7 @@ static void __init modem_assign_irq(struct gpio_chip *chip)
        struct gpio_desc *gpiod;
 
        gpiod = gpiochip_request_own_desc(chip, AMS_DELTA_GPIO_PIN_MODEM_IRQ,
-                                         "modem_irq");
+                                         "modem_irq", 0);
        if (IS_ERR(gpiod)) {
                pr_err("%s: modem IRQ GPIO request failed (%ld)\n", __func__,
                       PTR_ERR(gpiod));