projects
/
openwrt
/
staging
/
wigyori.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0513f7b
)
add board specific UART registration
author
Gabor Juhos
<juhosg@openwrt.org>
Tue, 23 Sep 2008 07:24:15 +0000
(07:24 +0000)
committer
Gabor 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
patch
|
blob
|
history
target/linux/adm5120/files-2.6.26/arch/mips/adm5120/cellvision/nfs-101.c
patch
|
blob
|
history
target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/board.c
patch
|
blob
|
history
target/linux/adm5120/files-2.6.26/arch/mips/adm5120/compex/compex.c
patch
|
blob
|
history
target/linux/adm5120/files-2.6.26/arch/mips/adm5120/edimax/br-61xx.c
patch
|
blob
|
history
target/linux/adm5120/files-2.6.26/arch/mips/adm5120/infineon/infineon.c
patch
|
blob
|
history
target/linux/adm5120/files-2.6.26/arch/mips/adm5120/mikrotik/rb-1xx.c
patch
|
blob
|
history
target/linux/adm5120/files-2.6.26/arch/mips/adm5120/zyxel/p-33x.c
patch
|
blob
|
history
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 15aa5feb96705c9b0b73819a4ff42a9dd4c533af..282c8c778c5f411553e6d8fe5bcdbad4a93a7b6c 100644
(file)
--- 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();
void __init cas6xx_setup(void)
{
cas6xx_flash_setup();
+ adm5120_add_device_uart(0);
+ adm5120_add_device_uart(1);
adm5120_add_device_switch(1, NULL);
}
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();
void __init cas7xx_setup(void)
{
cas7xx_flash_setup();
-
cellvision_mac_setup();
cellvision_mac_setup();
+ adm5120_add_device_uart(0);
+ adm5120_add_device_uart(1);
adm5120_add_device_switch(1, NULL);
}
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 700919ca26758764778a00c4ad1af298deaed236..3482e11bd24146fd4deec93a9786164e708bdd49 100644
(file)
--- 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();
static void __init nfs101_setup(void)
{
cas6xx_flash_setup();
-
cellvision_mac_setup();
cellvision_mac_setup();
+
+ adm5120_add_device_uart(0);
+ adm5120_add_device_uart(1);
adm5120_add_device_switch(5, nfs101_vlans);
}
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 ffca7e01c71016474d8d60698910e1e3ad22d124..be1fc9ab032197217dc02ceed0af387adae0d500 100644
(file)
--- 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_gpio_init();
- adm5120_add_device_uart(0);
- adm5120_add_device_uart(1);
-
if (board->board_setup)
board->board_setup();
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)
{
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);
}
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 d100bf0343cea00908040f44d8c49b700652a24a..c14655ada723ba4ef031754579ea601508677714 100644
(file)
--- 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_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();
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 e784713288f23cf9cee008434471ec660b966c91..6ecdb4e425bbb2e70b4996286efeff1b7ac00d9f 100644
(file)
--- 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_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);
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 bbe8c7195a8b44cbe25e7260566a76954a686572..b52edf0f6718c0d297653d096af959e57c55b6bf 100644
(file)
--- 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_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();
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_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();
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 8edca5bcb14633801a3d3f1797ffdc6643c1611c..7fc6e74dadf4123268466511a4e5fd6abb040d68 100644
(file)
--- 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_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);
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 2a83c9b2a46181a98f5552a00a3411c70ea51253..6d4d4ddee77e441d2aed780bfb48af845190080f 100644
(file)
--- 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);
#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);
adm5120_add_device_gpio(P33X_GPIO_DEV_MASK);
adm5120_setup_eth_macs(bootbase_info.mac);