[adm5120] add board specific UART registration
authorGabor Juhos <juhosg@openwrt.org>
Tue, 23 Sep 2008 07:24:15 +0000 (07:24 +0000)
committerGabor Juhos <juhosg@openwrt.org>
Tue, 23 Sep 2008 07:24:15 +0000 (07:24 +0000)
SVN-Revision: 12654

target/linux/adm5120/files-2.6.26/arch/mips/adm5120/cellvision/cellvision.c
target/linux/adm5120/files-2.6.26/arch/mips/adm5120/cellvision/nfs-101.c
target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/board.c
target/linux/adm5120/files-2.6.26/arch/mips/adm5120/compex/compex.c
target/linux/adm5120/files-2.6.26/arch/mips/adm5120/edimax/br-61xx.c
target/linux/adm5120/files-2.6.26/arch/mips/adm5120/infineon/infineon.c
target/linux/adm5120/files-2.6.26/arch/mips/adm5120/mikrotik/rb-1xx.c
target/linux/adm5120/files-2.6.26/arch/mips/adm5120/zyxel/p-33x.c

index 15aa5fe..282c8c7 100644 (file)
@@ -127,6 +127,8 @@ void __init cas7xx_flash_setup(void)
 void __init cas6xx_setup(void)
 {
        cas6xx_flash_setup();
+       adm5120_add_device_uart(0);
+       adm5120_add_device_uart(1);
        adm5120_add_device_switch(1, NULL);
 }
 
@@ -137,8 +139,9 @@ ADM5120_BOARD(MACH_ADM5120_CAS670, "Cellvision CAS-670/670W", cas6xx_setup);
 void __init cas7xx_setup(void)
 {
        cas7xx_flash_setup();
-
        cellvision_mac_setup();
+       adm5120_add_device_uart(0);
+       adm5120_add_device_uart(1);
        adm5120_add_device_switch(1, NULL);
 }
 
index 700919c..3482e11 100644 (file)
@@ -18,8 +18,10 @@ static u8 nfs101_vlans[6] __initdata = { /* TODO: not tested */
 static void __init nfs101_setup(void)
 {
        cas6xx_flash_setup();
-
        cellvision_mac_setup();
+
+       adm5120_add_device_uart(0);
+       adm5120_add_device_uart(1);
        adm5120_add_device_switch(5, nfs101_vlans);
 }
 
index ffca7e0..be1fc9a 100644 (file)
@@ -66,9 +66,6 @@ static int __init adm5120_board_setup(void)
 
        adm5120_gpio_init();
 
-       adm5120_add_device_uart(0);
-       adm5120_add_device_uart(1);
-
        if (board->board_setup)
                board->board_setup();
 
@@ -83,6 +80,9 @@ void __init adm5120_board_register(struct adm5120_board *board)
 
 static void __init adm5120_generic_board_setup(void)
 {
+       adm5120_add_device_uart(0);
+       adm5120_add_device_uart(1);
+
        adm5120_add_device_flash(0);
        adm5120_add_device_switch(6, NULL);
 }
index d100bf0..c14655a 100644 (file)
@@ -55,6 +55,9 @@ void __init compex_generic_setup(void)
        adm5120_flash0_data.switch_bank = switch_bank_gpio5;
        adm5120_add_device_flash(0);
 
+       adm5120_add_device_uart(0);
+       adm5120_add_device_uart(1);
+
        adm5120_add_device_gpio(COMPEX_GPIO_DEV_MASK);
 
        compex_mac_setup();
index e784713..6ecdb4e 100644 (file)
@@ -76,6 +76,9 @@ void __init br61xx_generic_setup(void)
 
        adm5120_add_device_gpio(BR61XX_GPIO_DEV_MASK);
 
+       adm5120_add_device_uart(0);
+       adm5120_add_device_uart(1);
+
        adm5120_add_device_switch(5, br61xx_vlans);
        adm5120_add_device_gpio_buttons(ARRAY_SIZE(br61xx_gpio_buttons),
                                        br61xx_gpio_buttons);
index bbe8c71..b52edf0 100644 (file)
@@ -73,6 +73,9 @@ void __init easy_setup_pqfp(void)
        adm5120_flash0_data.parts = easy_partitions;
 #endif /* CONFIG_MTD_PARTITIONS */
 
+       adm5120_add_device_uart(0);
+       adm5120_add_device_uart(1);
+
        adm5120_add_device_flash(0);
 
        easy_setup_mac();
@@ -102,6 +105,9 @@ void __init easy_setup_bga(void)
        adm5120_flash0_data.parts = easy_partitions;
 #endif /* CONFIG_MTD_PARTITIONS */
 
+       adm5120_add_device_uart(0);
+       adm5120_add_device_uart(1);
+
        adm5120_add_device_flash(0);
 
        easy_setup_mac();
index 8edca5b..7fc6e74 100644 (file)
@@ -141,6 +141,9 @@ void __init rb1xx_generic_setup(void)
                adm5120_pci_set_irq_map(ARRAY_SIZE(rb1xx_pci_irqs),
                                        rb1xx_pci_irqs);
 
+       adm5120_add_device_uart(0);
+       adm5120_add_device_uart(1);
+
        adm5120_add_device_gpio_buttons(ARRAY_SIZE(rb1xx_gpio_buttons),
                                        rb1xx_gpio_buttons);
 
index 2a83c9b..6d4d4dd 100644 (file)
@@ -77,6 +77,9 @@ void __init p33x_generic_setup(void)
 #endif /* CONFIG_MTD_PARTITIONS */
        adm5120_add_device_flash(0);
 
+       adm5120_add_device_uart(0);
+       adm5120_add_device_uart(1);
+
        adm5120_add_device_gpio(P33X_GPIO_DEV_MASK);
 
        adm5120_setup_eth_macs(bootbase_info.mac);