[adm5120] experimental gpiodev support (closes #3613)

[openwrt-10.03/.git] / target / linux / adm5120 / files / arch / mips / adm5120 / boards / compex.c

diff --git a/target/linux/adm5120/files/arch/mips/adm5120/boards/compex.c b/target/linux/adm5120/files/arch/mips/adm5120/boards/compex.c
index 1af0eb2d4bd9b4308dff8cf46555e5a393870d71..5cf858c294a9a90a09e2f537fcad25311307a511 100644 (file)
--- a/target/linux/adm5120/files/arch/mips/adm5120/boards/compex.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/boards/compex.c
@@ -22,6 +22,13 @@
 #include <adm5120_platform.h>
 #include <adm5120_irq.h>
 
+#define NP27G_GPIO_DEV_MASK    (1 << ADM5120_GPIO_PIN5)
+#define NP28G_GPIO_DEV_MASK    ( 1 << ADM5120_GPIO_PIN5 \
+                               | 1 << ADM5120_GPIO_PIN4)
+
+#define WP54_GPIO_DEV_MASK     ( 1 << ADM5120_GPIO_PIN5 \
+                               | 1 << ADM5120_GPIO_PIN3)
+
 static struct adm5120_pci_irq wp54_pci_irqs[] __initdata = {
        PCIIRQ(2, 0, 1, ADM5120_IRQ_PCI0),
 };
@@ -104,6 +111,7 @@ static void __init np27g_setup(void)
 
        /* setup data for flash0 device */
        adm5120_flash0_data.switch_bank = switch_bank_gpio5;
+       adm5120_gpiodev_resource.start &= ~NP27G_GPIO_DEV_MASK;
 
        /* TODO: setup mac address */
 }
@@ -119,6 +127,8 @@ static void __init np28g_setup(void)
        /* setup data for flash0 device */
        adm5120_flash0_data.switch_bank = switch_bank_gpio5;
 
+       adm5120_gpiodev_resource.start &= ~NP28G_GPIO_DEV_MASK;
+
        /* TODO: setup mac address */
 }
 
@@ -137,6 +147,8 @@ static void __init wp54_setup(void)
        adm5120_buttons[0].desc = "reset button";
        adm5120_buttons[0].gpio = ADM5120_GPIO_PIN2;
 
+       adm5120_gpiodev_resource.start &= ~WP54_GPIO_DEV_MASK;
+
        /* TODO: setup mac address */
 }