From 5f8749031e0b989876b1b1a8e6537d623f88394b Mon Sep 17 00:00:00 2001 From: juhosg Date: Tue, 23 Sep 2008 07:24:15 +0000 Subject: [adm5120] add board specific UART registration git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12654 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../adm5120/files-2.6.26/arch/mips/adm5120/cellvision/cellvision.c | 5 ++++- .../adm5120/files-2.6.26/arch/mips/adm5120/cellvision/nfs-101.c | 4 +++- target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/board.c | 6 +++--- target/linux/adm5120/files-2.6.26/arch/mips/adm5120/compex/compex.c | 3 +++ .../linux/adm5120/files-2.6.26/arch/mips/adm5120/edimax/br-61xx.c | 3 +++ .../adm5120/files-2.6.26/arch/mips/adm5120/infineon/infineon.c | 6 ++++++ .../linux/adm5120/files-2.6.26/arch/mips/adm5120/mikrotik/rb-1xx.c | 3 +++ target/linux/adm5120/files-2.6.26/arch/mips/adm5120/zyxel/p-33x.c | 3 +++ 8 files changed, 28 insertions(+), 5 deletions(-) (limited to 'target') diff --git a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/cellvision/cellvision.c b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/cellvision/cellvision.c index 15aa5feb9..282c8c778 100644 --- a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/cellvision/cellvision.c +++ b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/cellvision/cellvision.c @@ -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); } diff --git a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/cellvision/nfs-101.c b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/cellvision/nfs-101.c index 700919ca2..3482e11bd 100644 --- a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/cellvision/nfs-101.c +++ b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/cellvision/nfs-101.c @@ -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); } diff --git a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/board.c b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/board.c index ffca7e01c..be1fc9ab0 100644 --- a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/board.c +++ b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/board.c @@ -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); } diff --git a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/compex/compex.c b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/compex/compex.c index d100bf034..c14655ada 100644 --- a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/compex/compex.c +++ b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/compex/compex.c @@ -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(); diff --git a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/edimax/br-61xx.c b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/edimax/br-61xx.c index e78471328..6ecdb4e42 100644 --- a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/edimax/br-61xx.c +++ b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/edimax/br-61xx.c @@ -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); diff --git a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/infineon/infineon.c b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/infineon/infineon.c index bbe8c7195..b52edf0f6 100644 --- a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/infineon/infineon.c +++ b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/infineon/infineon.c @@ -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(); diff --git a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/mikrotik/rb-1xx.c b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/mikrotik/rb-1xx.c index 8edca5bcb..7fc6e74da 100644 --- a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/mikrotik/rb-1xx.c +++ b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/mikrotik/rb-1xx.c @@ -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); diff --git a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/zyxel/p-33x.c b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/zyxel/p-33x.c index 2a83c9b2a..6d4d4ddee 100644 --- a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/zyxel/p-33x.c +++ b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/zyxel/p-33x.c @@ -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); -- cgit v1.2.3