[adm5120] fix gpio number of the reset button Compex WP54 boards

[openwrt/svn-archive/archive.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 a58bec3d4357b9c6d4563f65cccc60f0f224d340..71fa17dd040b270ae7237273e568baf7ffc6c6f6 100644 (file)
--- a/target/linux/adm5120/files/arch/mips/adm5120/boards/compex.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/boards/compex.c
@@ -3,23 +3,12 @@
  *
  *  Compex boards
  *
- *  Copyright (C) 2007 OpenWrt.org
- *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org>
+ *  Copyright (C) 2007-2008 OpenWrt.org
+ *  Copyright (C) 2007-2008 Gabor Juhos <juhosg at openwrt.org>
  *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version 2
- *  of the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the
- *  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA  02110-1301, USA.
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
  *
  */
 
@@ -33,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),
 };
@@ -68,6 +64,7 @@ static struct platform_device *np2xg_devices[] __initdata = {
 
 static struct platform_device *wp54_devices[] __initdata = {
        &adm5120_flash0_device,
+       &adm5120_buttons_device,
 };
 
 unsigned char np27g_vlans[6] __initdata = {
@@ -102,33 +99,40 @@ static void wp54_reset(void)
        gpio_set_value(ADM5120_GPIO_PIN3, 0);
 }
 
-static void __init np2xg_setup(void)
+static void np28g_reset(void)
+{
+       gpio_set_value(ADM5120_GPIO_PIN4, 0);
+}
+
+static void __init np27g_setup(void)
 {
        gpio_request(ADM5120_GPIO_PIN5, NULL); /* for flash A20 line */
        gpio_direction_output(ADM5120_GPIO_PIN5, 0);
 
        /* 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 */
 }
 
-static void __init wp54_setup(void)
+static void __init np28g_setup(void)
 {
        gpio_request(ADM5120_GPIO_PIN5, NULL); /* for flash A20 line */
        gpio_direction_output(ADM5120_GPIO_PIN5, 0);
 
-       gpio_request(ADM5120_GPIO_PIN3, NULL); /* for system reset */
-       gpio_direction_output(ADM5120_GPIO_PIN3, 1);
-
+       gpio_request(ADM5120_GPIO_PIN4, NULL); /* for system reset */
+       gpio_direction_output(ADM5120_GPIO_PIN4, 1);
 
        /* 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 */
 }
 
-static void __init wp54_wrt_setup(void)
+static void __init wp54_setup(void)
 {
        gpio_request(ADM5120_GPIO_PIN5, NULL); /* for flash A20 line */
        gpio_direction_output(ADM5120_GPIO_PIN5, 0);
@@ -138,6 +142,20 @@ static void __init wp54_wrt_setup(void)
 
        /* setup data for flash0 device */
        adm5120_flash0_data.switch_bank = switch_bank_gpio5;
+
+       adm5120_buttons_data.nbuttons = 1;
+       adm5120_buttons[0].desc = "reset button";
+       adm5120_buttons[0].gpio = ADM5120_GPIO_PIN4;
+
+       adm5120_gpiodev_resource.start &= ~WP54_GPIO_DEV_MASK;
+
+       /* TODO: setup mac address */
+}
+
+static void __init wp54_wrt_setup(void)
+{
+       wp54_setup();
+
        adm5120_flash0_data.nr_parts = ARRAY_SIZE(wp54g_wrt_partitions);
        adm5120_flash0_data.parts = wp54g_wrt_partitions;
 
@@ -147,15 +165,17 @@ static void __init wp54_wrt_setup(void)
 /*--------------------------------------------------------------------------*/
 
 ADM5120_BOARD_START(NP27G, "Compex NetPassage 27G")
-       .board_setup    = np2xg_setup,
+       .board_setup    = np27g_setup,
        .eth_num_ports  = 5,
        .eth_vlans      = np27g_vlans,
        .num_devices    = ARRAY_SIZE(np2xg_devices),
        .devices        = np2xg_devices,
+       /* TODO: add PCI IRQ map */
 ADM5120_BOARD_END
 
 ADM5120_BOARD_START(NP28G, "Compex NetPassage 28G")
-       .board_setup    = np2xg_setup,
+       .board_setup    = np28g_setup,
+       .board_reset    = np28g_reset,
        .eth_num_ports  = 4,
        .eth_vlans      = np28g_vlans,
        .num_devices    = ARRAY_SIZE(np2xg_devices),