Revert r12510. Remove -rpath-link form TARGET_LDFLAGS as it breaks some

[openwrt/svn-archive/archive.git] / target / linux / adm5120 / files / arch / mips / adm5120 / boards / edimax.c

diff --git a/target/linux/adm5120/files/arch/mips/adm5120/boards/edimax.c b/target/linux/adm5120/files/arch/mips/adm5120/boards/edimax.c
index e53e8361371e81009f35f6e32c613ed616a17839..65023ab6622555d8c17c26b63fb5dc1c6c9e7274 100644 (file)
--- a/target/linux/adm5120/files/arch/mips/adm5120/boards/edimax.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/boards/edimax.c
@@ -3,23 +3,12 @@
  *
  *  Edimax 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.
  *
  */
 
@@ -57,6 +46,7 @@ static struct mtd_partition br61xx_partitions[] = {
 static struct platform_device *br6104k_devices[] __initdata = {
        &adm5120_flash0_device,
        &adm5120_hcd_device,
+       &adm5120_buttons_device,
 };
 
 static struct platform_device *br61x4wg_devices[] __initdata = {
@@ -68,6 +58,10 @@ static void __init br61xx_setup(void) {
        adm5120_flash0_data.nr_parts = ARRAY_SIZE(br61xx_partitions);
        adm5120_flash0_data.parts = br61xx_partitions;
 
+       adm5120_buttons_data.nbuttons = 1;
+       adm5120_buttons[0].desc = "reset button";
+       adm5120_buttons[0].gpio = ADM5120_GPIO_PIN2;
+
        /* TODO: setup mac addresses, if possible */
 }
 
@@ -75,19 +69,17 @@ unsigned char br61xx_vlans[6] = {
        0x41, 0x42, 0x44, 0x48, 0x50, 0x00
 };
 
-static struct adm5120_board br6104k_board __initdata = {
-       .mach_type      = MACH_ADM5120_BR6104K,
-       .name           = "Edimax BR-6104K/6104KP",
+/*--------------------------------------------------------------------------*/
+
+ADM5120_BOARD_START(BR6104K, "Edimax BR-6104K/6104KP")
        .board_setup    = br61xx_setup,
        .eth_num_ports  = 5,
        .eth_vlans      = br61xx_vlans,
        .num_devices    = ARRAY_SIZE(br6104k_devices),
        .devices        = br6104k_devices,
-};
+ADM5120_BOARD_END
 
-static struct adm5120_board br61x4wg_board __initdata = {
-       .mach_type      = MACH_ADM5120_BR61x4WG,
-       .name           = "Edimax BR-6104WG/6114WG",
+ADM5120_BOARD_START(BR61x4WG, "Edimax BR-6104WG/6114WG")
        .board_setup    = br61xx_setup,
        .eth_num_ports  = 5,
        .eth_vlans      = br61xx_vlans,
@@ -95,13 +87,4 @@ static struct adm5120_board br61x4wg_board __initdata = {
        .devices        = br61x4wg_devices,
        .pci_nr_irqs    = ARRAY_SIZE(br61xx_pci_irqs),
        .pci_irq_map    = br61xx_pci_irqs,
-};
-
-static int __init register_boards(void)
-{
-       adm5120_board_register(&br6104k_board);
-       adm5120_board_register(&br61x4wg_board);
-       return 0;
-}
-
-pure_initcall(register_boards);
+ADM5120_BOARD_END