From fa75bd977aef048870c7555c88f36acd7872574a Mon Sep 17 00:00:00 2001
From: Jonas Gorski <jogo@openwrt.org>
Date: Tue, 31 Jul 2012 14:27:25 +0000
Subject: [PATCH] bcm63xx: reorder patches
Fix the order and names of patches.
Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com>
SVN-Revision: 32920
---
target/linux/brcm63xx/patches-3.3/300-reset_buttons.patch | 4 ++--
target/linux/brcm63xx/patches-3.3/301-led_count.patch | 4 ++--
.../brcm63xx/patches-3.3/302-extended-platform-devices.patch | 2 +-
target/linux/brcm63xx/patches-3.3/303-spi-board-info.patch | 2 +-
target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch | 2 +-
.../{107-cfe_version_mod.patch => 311-cfe_version_mod.patch} | 2 +-
...IPS-BCM63XX-store-the-flash-type-in-global-variable.patch} | 0
.../{553-board_96348w3.patch => 525-board_96348w3.patch} | 4 ++--
.../{554-board_CT6373-1.patch => 526-board_CT6373-1.patch} | 4 ++--
...va-g3810bn-tl-1.patch => 527-board_dva-g3810bn-tl-1.patch} | 4 ++--
target/linux/brcm63xx/patches-3.3/550-alice_gate2_leds.patch | 2 +-
target/linux/brcm63xx/patches-3.3/551-96348gw_a_leds.patch | 2 +-
.../patches-3.3/552-board_96348gw-10_reset_button.patch | 2 +-
13 files changed, 17 insertions(+), 17 deletions(-)
rename target/linux/brcm63xx/patches-3.3/{107-cfe_version_mod.patch => 311-cfe_version_mod.patch} (94%)
rename target/linux/brcm63xx/patches-3.3/{427-MTD-m25p80-allow-passing-pp_data.patch => 427-MIPS-BCM63XX-store-the-flash-type-in-global-variable.patch} (100%)
rename target/linux/brcm63xx/patches-3.3/{553-board_96348w3.patch => 525-board_96348w3.patch} (89%)
rename target/linux/brcm63xx/patches-3.3/{554-board_CT6373-1.patch => 526-board_CT6373-1.patch} (95%)
rename target/linux/brcm63xx/patches-3.3/{555-board_dva-g3810bn-tl-1.patch => 527-board_dva-g3810bn-tl-1.patch} (91%)
diff --git a/target/linux/brcm63xx/patches-3.3/300-reset_buttons.patch b/target/linux/brcm63xx/patches-3.3/300-reset_buttons.patch
index 28a88e6d1f..0e1d6f8d95 100644
--- a/target/linux/brcm63xx/patches-3.3/300-reset_buttons.patch
+++ b/target/linux/brcm63xx/patches-3.3/300-reset_buttons.patch
@@ -53,7 +53,7 @@
};
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,
};
@@ -77,7 +77,7 @@
if (board.has_uart0)
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);
diff --git a/target/linux/brcm63xx/patches-3.3/301-led_count.patch b/target/linux/brcm63xx/patches-3.3/301-led_count.patch
index 4299d682e0..84d57a00dd 100644
--- a/target/linux/brcm63xx/patches-3.3/301-led_count.patch
+++ b/target/linux/brcm63xx/patches-3.3/301-led_count.patch
@@ -1,6 +1,6 @@
--- a/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 button_count = 0;
@@ -8,7 +8,7 @@
if (board.has_uart0)
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();
diff --git a/target/linux/brcm63xx/patches-3.3/302-extended-platform-devices.patch b/target/linux/brcm63xx/patches-3.3/302-extended-platform-devices.patch
index d2b99a5816..b48ef733bf 100644
--- a/target/linux/brcm63xx/patches-3.3/302-extended-platform-devices.patch
+++ b/target/linux/brcm63xx/patches-3.3/302-extended-platform-devices.patch
@@ -1,6 +1,6 @@
--- a/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();
diff --git a/target/linux/brcm63xx/patches-3.3/303-spi-board-info.patch b/target/linux/brcm63xx/patches-3.3/303-spi-board-info.patch
index b81adb50e8..517a53b565 100644
--- a/target/linux/brcm63xx/patches-3.3/303-spi-board-info.patch
+++ b/target/linux/brcm63xx/patches-3.3/303-spi-board-info.patch
@@ -8,7 +8,7 @@
#include <asm/addrspace.h>
#include <bcm63xx_board.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)
platform_add_devices(board.devs, board.num_devs);
diff --git a/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch b/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
index b486a86457..0c2fab5753 100644
--- a/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
+++ b/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
@@ -47,7 +47,7 @@
/*
* 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;
}
diff --git a/target/linux/brcm63xx/patches-3.3/107-cfe_version_mod.patch b/target/linux/brcm63xx/patches-3.3/311-cfe_version_mod.patch
similarity index 94%
rename from target/linux/brcm63xx/patches-3.3/107-cfe_version_mod.patch
rename to target/linux/brcm63xx/patches-3.3/311-cfe_version_mod.patch
index c00ed113e3..1269bc0c47 100644
--- a/target/linux/brcm63xx/patches-3.3/107-cfe_version_mod.patch
+++ b/target/linux/brcm63xx/patches-3.3/311-cfe_version_mod.patch
@@ -1,6 +1,6 @@
--- a/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))
snprintf(cfe_version, sizeof(cfe_version), "%u.%u.%u-%u.%u",
cfe[5], cfe[6], cfe[7], cfe[8], cfe[9]);
diff --git a/target/linux/brcm63xx/patches-3.3/427-MTD-m25p80-allow-passing-pp_data.patch b/target/linux/brcm63xx/patches-3.3/427-MIPS-BCM63XX-store-the-flash-type-in-global-variable.patch
similarity index 100%
rename from target/linux/brcm63xx/patches-3.3/427-MTD-m25p80-allow-passing-pp_data.patch
rename to target/linux/brcm63xx/patches-3.3/427-MIPS-BCM63XX-store-the-flash-type-in-global-variable.patch
diff --git a/target/linux/brcm63xx/patches-3.3/553-board_96348w3.patch b/target/linux/brcm63xx/patches-3.3/525-board_96348w3.patch
similarity index 89%
rename from target/linux/brcm63xx/patches-3.3/553-board_96348w3.patch
rename to target/linux/brcm63xx/patches-3.3/525-board_96348w3.patch
index 4f20a6426f..ffce6fc14a 100644
--- a/target/linux/brcm63xx/patches-3.3/553-board_96348w3.patch
+++ b/target/linux/brcm63xx/patches-3.3/525-board_96348w3.patch
@@ -1,6 +1,6 @@
--- a/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
/*
-@@ -2554,6 +2605,7 @@ static const struct board_info __initdat
+@@ -2438,6 +2489,7 @@ static const struct board_info __initdat
&board_ct536_ct5621,
&board_96348A_122,
&board_CPVA502plus,
diff --git a/target/linux/brcm63xx/patches-3.3/554-board_CT6373-1.patch b/target/linux/brcm63xx/patches-3.3/526-board_CT6373-1.patch
similarity index 95%
rename from target/linux/brcm63xx/patches-3.3/554-board_CT6373-1.patch
rename to target/linux/brcm63xx/patches-3.3/526-board_CT6373-1.patch
index 9b36baf727..effd9f6d95 100644
--- a/target/linux/brcm63xx/patches-3.3/554-board_CT6373-1.patch
+++ b/target/linux/brcm63xx/patches-3.3/526-board_CT6373-1.patch
@@ -14,7 +14,7 @@
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),
};
@@ -126,7 +126,7 @@
static struct board_info __initdata board_HW553 = {
.name = "HW553",
.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_fxc_r1,
&board_nb4_fxc_r2,
diff --git a/target/linux/brcm63xx/patches-3.3/555-board_dva-g3810bn-tl-1.patch b/target/linux/brcm63xx/patches-3.3/527-board_dva-g3810bn-tl-1.patch
similarity index 91%
rename from target/linux/brcm63xx/patches-3.3/555-board_dva-g3810bn-tl-1.patch
rename to target/linux/brcm63xx/patches-3.3/527-board_dva-g3810bn-tl-1.patch
index d2f91df6c5..034626c8a4 100644
--- a/target/linux/brcm63xx/patches-3.3/555-board_dva-g3810bn-tl-1.patch
+++ b/target/linux/brcm63xx/patches-3.3/527-board_dva-g3810bn-tl-1.patch
@@ -1,6 +1,6 @@
--- a/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
/*
-@@ -2735,6 +2800,7 @@ static const struct board_info __initdat
+@@ -2619,6 +2684,7 @@ static const struct board_info __initdat
&board_ct6373_1,
&board_HW553,
&board_spw303v,
diff --git a/target/linux/brcm63xx/patches-3.3/550-alice_gate2_leds.patch b/target/linux/brcm63xx/patches-3.3/550-alice_gate2_leds.patch
index bd43da5c0c..ebf6f65421 100644
--- a/target/linux/brcm63xx/patches-3.3/550-alice_gate2_leds.patch
+++ b/target/linux/brcm63xx/patches-3.3/550-alice_gate2_leds.patch
@@ -1,6 +1,6 @@
--- a/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_ehci0 = 1,
diff --git a/target/linux/brcm63xx/patches-3.3/551-96348gw_a_leds.patch b/target/linux/brcm63xx/patches-3.3/551-96348gw_a_leds.patch
index 06ecfb6a89..02938c3eef 100644
--- a/target/linux/brcm63xx/patches-3.3/551-96348gw_a_leds.patch
+++ b/target/linux/brcm63xx/patches-3.3/551-96348gw_a_leds.patch
@@ -1,6 +1,6 @@
--- a/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,
diff --git a/target/linux/brcm63xx/patches-3.3/552-board_96348gw-10_reset_button.patch b/target/linux/brcm63xx/patches-3.3/552-board_96348gw-10_reset_button.patch
index a07e6fdf29..0a464c8d5b 100644
--- a/target/linux/brcm63xx/patches-3.3/552-board_96348gw-10_reset_button.patch
+++ b/target/linux/brcm63xx/patches-3.3/552-board_96348gw-10_reset_button.patch
@@ -1,6 +1,6 @@
--- a/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,
},
},
--
2.34.1