bcm63xx: reorder patches

Fix the order and names of patches.

Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com>

SVN-Revision: 32920
owl
Jonas Gorski 2012-07-31 14:27:25 +00:00
parent d1ab4df0d6
commit fa75bd977a
13 changed files with 17 additions and 17 deletions

View File

@ -53,7 +53,7 @@
}; };
static struct board_info __initdata board_FAST2404 = { static struct board_info __initdata board_FAST2404 = {
@@ -823,11 +848,23 @@ static struct platform_device bcm63xx_gp @@ -821,11 +846,23 @@ static struct platform_device bcm63xx_gp
.dev.platform_data = &bcm63xx_led_data, .dev.platform_data = &bcm63xx_led_data,
}; };
@ -77,7 +77,7 @@
if (board.has_uart0) if (board.has_uart0)
bcm63xx_uart_register(0); bcm63xx_uart_register(0);
@@ -870,5 +907,16 @@ int __init board_register_devices(void) @@ -868,5 +905,16 @@ int __init board_register_devices(void)
platform_device_register(&bcm63xx_gpio_leds); platform_device_register(&bcm63xx_gpio_leds);

View File

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -864,6 +864,7 @@ static struct platform_device bcm63xx_gp @@ -862,6 +862,7 @@ static struct platform_device bcm63xx_gp
int __init board_register_devices(void) int __init board_register_devices(void)
{ {
int button_count = 0; int button_count = 0;
@ -8,7 +8,7 @@
if (board.has_uart0) if (board.has_uart0)
bcm63xx_uart_register(0); bcm63xx_uart_register(0);
@@ -902,7 +903,11 @@ int __init board_register_devices(void) @@ -900,7 +901,11 @@ int __init board_register_devices(void)
bcm63xx_flash_register(); bcm63xx_flash_register();

View File

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -901,6 +901,9 @@ int __init board_register_devices(void) @@ -899,6 +899,9 @@ int __init board_register_devices(void)
bcm63xx_spi_register(); bcm63xx_spi_register();

View File

@ -8,7 +8,7 @@
#include <asm/addrspace.h> #include <asm/addrspace.h>
#include <bcm63xx_board.h> #include <bcm63xx_board.h>
#include <bcm63xx_cpu.h> #include <bcm63xx_cpu.h>
@@ -904,6 +905,9 @@ int __init board_register_devices(void) @@ -902,6 +903,9 @@ int __init board_register_devices(void)
if (board.num_devs) if (board.num_devs)
platform_add_devices(board.devs, board.num_devs); platform_add_devices(board.devs, board.num_devs);

View File

@ -47,7 +47,7 @@
/* /*
* early init callback, read nvram data from flash and checksum it * early init callback, read nvram data from flash and checksum it
*/ */
@@ -773,6 +800,11 @@ void __init board_prom_init(void) @@ -771,6 +798,11 @@ void __init board_prom_init(void)
return; return;
} }

View File

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -724,6 +724,8 @@ void __init board_prom_init(void) @@ -777,6 +777,8 @@ void __init board_prom_init(void)
if (!memcmp(cfe, "cfe-v", 5)) if (!memcmp(cfe, "cfe-v", 5))
snprintf(cfe_version, sizeof(cfe_version), "%u.%u.%u-%u.%u", snprintf(cfe_version, sizeof(cfe_version), "%u.%u.%u-%u.%u",
cfe[5], cfe[6], cfe[7], cfe[8], cfe[9]); cfe[5], cfe[6], cfe[7], cfe[8], cfe[9]);

View File

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1358,6 +1358,57 @@ static struct board_info __initdata boar @@ -1334,6 +1334,57 @@ static struct board_info __initdata boar
}, },
}; };
@ -58,7 +58,7 @@
#endif #endif
/* /*
@@ -2554,6 +2605,7 @@ static const struct board_info __initdat @@ -2438,6 +2489,7 @@ static const struct board_info __initdat
&board_ct536_ct5621, &board_ct536_ct5621,
&board_96348A_122, &board_96348A_122,
&board_CPVA502plus, &board_CPVA502plus,

View File

@ -14,7 +14,7 @@
static struct board_info board; static struct board_info board;
/* /*
@@ -2287,6 +2294,111 @@ static struct board_info __initdata boar @@ -2171,6 +2178,111 @@ static struct board_info __initdata boar
.num_spis = ARRAY_SIZE(nb4_spi_devices), .num_spis = ARRAY_SIZE(nb4_spi_devices),
}; };
@ -126,7 +126,7 @@
static struct board_info __initdata board_HW553 = { static struct board_info __initdata board_HW553 = {
.name = "HW553", .name = "HW553",
.expected_cpu_id = 0x6358, .expected_cpu_id = 0x6358,
@@ -2620,6 +2732,7 @@ static const struct board_info __initdat @@ -2504,6 +2616,7 @@ static const struct board_info __initdat
&board_nb4_ser_r2, &board_nb4_ser_r2,
&board_nb4_fxc_r1, &board_nb4_fxc_r1,
&board_nb4_fxc_r2, &board_nb4_fxc_r2,

View File

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -2538,6 +2538,71 @@ static struct board_info __initdata boar @@ -2422,6 +2422,71 @@ static struct board_info __initdata boar
}, },
} }
}; };
@ -72,7 +72,7 @@
#endif #endif
/* /*
@@ -2735,6 +2800,7 @@ static const struct board_info __initdat @@ -2619,6 +2684,7 @@ static const struct board_info __initdat
&board_ct6373_1, &board_ct6373_1,
&board_HW553, &board_HW553,
&board_spw303v, &board_spw303v,

View File

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1551,6 +1551,98 @@ static struct board_info __initdata boar @@ -1609,6 +1609,98 @@ static struct board_info __initdata boar
.has_ohci0 = 1, .has_ohci0 = 1,
.has_ehci0 = 1, .has_ehci0 = 1,

View File

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1059,6 +1059,19 @@ static struct board_info __initdata boar @@ -1066,6 +1066,19 @@ static struct board_info __initdata boar
}, },
.has_ohci0 = 1, .has_ohci0 = 1,

View File

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -576,6 +576,17 @@ static struct board_info __initdata boar @@ -583,6 +583,17 @@ static struct board_info __initdata boar
.active_low = 1, .active_low = 1,
}, },
}, },