[adm5120] more license cleanups

[openwrt.git] / target / linux / adm5120 / files / arch / mips / adm5120 / board.c

diff --git a/target/linux/adm5120/files/arch/mips/adm5120/board.c b/target/linux/adm5120/files/arch/mips/adm5120/board.c
index 44e59aa..0153cce 100644 (file)
--- a/target/linux/adm5120/files/arch/mips/adm5120/board.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/board.c
@@ -6,20 +6,9 @@
  *  Copyright (C) 2007 OpenWrt.org
  *  Copyright (C) 2007 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.
  *
  */
 
@@ -37,6 +26,8 @@
 #include <adm5120_board.h>
 #include <adm5120_platform.h>
 
+#define PFX    "adm5120: "
+
 static LIST_HEAD(adm5120_boards);
 static char adm5120_board_name[ADM5120_BOARD_NAMELEN];
 
@@ -70,17 +61,19 @@ static int __init adm5120_board_setup(void)
 
        board = adm5120_board_find(mips_machtype);
        if (board == NULL) {
-               printk(KERN_ALERT "adm5120: no board registered for machtype %lu"
-                       ", trying generic\n", mips_machtype);
+               printk(KERN_ALERT PFX"no board registered for "
+                       "machtype %lu, trying generic\n", mips_machtype);
                board = adm5120_board_find(MACH_ADM5120_GENERIC);
                if (board == NULL)
-                       panic("adm5120: unsupported board\n");
+                       panic(PFX "unsupported board\n");
        }
 
-       printk(KERN_INFO "adm5120: setting up board '%s'\n", board->name);
+       printk(KERN_INFO PFX "setting up board '%s'\n", board->name);
 
        memcpy(&adm5120_board_name, board->name, ADM5120_BOARD_NAMELEN);
 
+       adm5120_gpio_init();
+
        adm5120_board_reset = board->board_reset;
        if (board->eth_num_ports > 0)
                adm5120_eth_num_ports = board->eth_num_ports;
@@ -96,14 +89,17 @@ static int __init adm5120_board_setup(void)
        amba_device_register(&adm5120_uart0_device, &iomem_resource);
        amba_device_register(&adm5120_uart1_device, &iomem_resource);
 
+       /* register built-in ethernet switch */
+       platform_device_register(&adm5120_switch_device);
+
        /* setup PCI irq map */
        adm5120_pci_set_irq_map(board->pci_nr_irqs, board->pci_irq_map);
 
        /* register board devices */
-       if (board->num_devices > 0 && board->devices != NULL ) {
+       if (board->num_devices > 0 && board->devices != NULL) {
                err = platform_add_devices(board->devices, board->num_devices);
                if (err)
-                       printk(KERN_ALERT "adm5120: adding board devices failed\n");
+                       printk(KERN_ALERT PFX "adding board devices failed\n");
        }
 
        return 0;
@@ -112,16 +108,6 @@ arch_initcall(adm5120_board_setup);
 
 void __init adm5120_board_register(struct adm5120_board *board)
 {
-       list_add(&board->list, &adm5120_boards);
-       printk(KERN_INFO "adm5120: registered board '%s'\n", board->name);
+       list_add_tail(&board->list, &adm5120_boards);
+       printk(KERN_INFO PFX "registered board '%s'\n", board->name);
 }
-
-void __init adm5120_register_boards(struct adm5120_board **boards,
-               int num)
-{
-       int i;
-
-       for (i=0; i<num; i++)
-               adm5120_board_register(boards[i]);
-}
-