From 9601ce7e1f2b2ba4df99d9db0b282ef53001dfdc Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Thu, 26 May 2011 12:09:15 +0000 Subject: [PATCH] [brcm63xx] renumber board patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27012 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ...t_check.patch => 210-no_ehci_over_current_check.patch} | 0 .../{300-wl_exports.patch => 220-wl_exports.patch} | 4 ++-- ...ii-clk.patch => 230-6358-enet1-external-mii-clk.patch} | 2 +- target/linux/brcm63xx/patches-2.6.37/240-spi.patch | 6 +++--- .../{220-board-D4PW.patch => 250-board-D4PW.patch} | 4 ++-- .../{221-board-NB4.patch => 260-board-NB4.patch} | 8 ++++---- .../brcm63xx/patches-2.6.37/270-board-96338W2_E7T.patch | 4 ++-- .../{310-CPVA642_board.patch => 310-board-CPVA642.patch} | 0 .../{980-board_BTV2110.patch => 455-board_BTV2110.patch} | 4 ++-- .../{170-board_livebox.patch => 456-board_livebox.patch} | 0 .../patches-2.6.37/500-ssb-add-callback-for-sprom.patch | 4 ++-- .../patches-2.6.37/977-ssb_export_fallback_sprom.patch | 4 ++-- 12 files changed, 20 insertions(+), 20 deletions(-) rename target/linux/brcm63xx/patches-2.6.37/{260-no_ehci_over_current_check.patch => 210-no_ehci_over_current_check.patch} (100%) rename target/linux/brcm63xx/patches-2.6.37/{300-wl_exports.patch => 220-wl_exports.patch} (88%) rename target/linux/brcm63xx/patches-2.6.37/{250-6358-enet1-external-mii-clk.patch => 230-6358-enet1-external-mii-clk.patch} (93%) rename target/linux/brcm63xx/patches-2.6.37/{220-board-D4PW.patch => 250-board-D4PW.patch} (87%) rename target/linux/brcm63xx/patches-2.6.37/{221-board-NB4.patch => 260-board-NB4.patch} (98%) rename target/linux/brcm63xx/patches-2.6.37/{310-CPVA642_board.patch => 310-board-CPVA642.patch} (100%) rename target/linux/brcm63xx/patches-2.6.37/{980-board_BTV2110.patch => 455-board_BTV2110.patch} (94%) rename target/linux/brcm63xx/patches-2.6.37/{170-board_livebox.patch => 456-board_livebox.patch} (100%) diff --git a/target/linux/brcm63xx/patches-2.6.37/260-no_ehci_over_current_check.patch b/target/linux/brcm63xx/patches-2.6.37/210-no_ehci_over_current_check.patch similarity index 100% rename from target/linux/brcm63xx/patches-2.6.37/260-no_ehci_over_current_check.patch rename to target/linux/brcm63xx/patches-2.6.37/210-no_ehci_over_current_check.patch diff --git a/target/linux/brcm63xx/patches-2.6.37/300-wl_exports.patch b/target/linux/brcm63xx/patches-2.6.37/220-wl_exports.patch similarity index 88% rename from target/linux/brcm63xx/patches-2.6.37/300-wl_exports.patch rename to target/linux/brcm63xx/patches-2.6.37/220-wl_exports.patch index aa7322d9e5..fcd5c641f9 100644 --- a/target/linux/brcm63xx/patches-2.6.37/300-wl_exports.patch +++ b/target/linux/brcm63xx/patches-2.6.37/220-wl_exports.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -49,6 +49,13 @@ static unsigned int mac_addr_used; +@@ -39,6 +39,13 @@ static unsigned int mac_addr_used; static struct board_info board; /* @@ -14,7 +14,7 @@ * known 6338 boards */ #ifdef CONFIG_BCM63XX_CPU_6338 -@@ -1444,6 +1451,7 @@ void __init board_prom_init(void) +@@ -840,6 +847,7 @@ void __init board_prom_init(void) /* extract nvram data */ memcpy(&nvram, boot_addr + BCM963XX_NVRAM_OFFSET, sizeof(nvram)); diff --git a/target/linux/brcm63xx/patches-2.6.37/250-6358-enet1-external-mii-clk.patch b/target/linux/brcm63xx/patches-2.6.37/230-6358-enet1-external-mii-clk.patch similarity index 93% rename from target/linux/brcm63xx/patches-2.6.37/250-6358-enet1-external-mii-clk.patch rename to target/linux/brcm63xx/patches-2.6.37/230-6358-enet1-external-mii-clk.patch index 3e033fb233..51055b87f9 100644 --- a/target/linux/brcm63xx/patches-2.6.37/250-6358-enet1-external-mii-clk.patch +++ b/target/linux/brcm63xx/patches-2.6.37/230-6358-enet1-external-mii-clk.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1477,6 +1477,8 @@ void __init board_prom_init(void) +@@ -911,6 +911,8 @@ void __init board_prom_init(void) if (BCMCPU_IS_6348()) val |= GPIO_MODE_6348_G3_EXT_MII | GPIO_MODE_6348_G0_EXT_MII; diff --git a/target/linux/brcm63xx/patches-2.6.37/240-spi.patch b/target/linux/brcm63xx/patches-2.6.37/240-spi.patch index 35c490c4df..611bf59bb2 100644 --- a/target/linux/brcm63xx/patches-2.6.37/240-spi.patch +++ b/target/linux/brcm63xx/patches-2.6.37/240-spi.patch @@ -200,7 +200,7 @@ #define BCM_6358_OHCI0_IRQ (IRQ_INTERNAL_BASE + 5) --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h -@@ -769,4 +769,116 @@ +@@ -771,4 +771,116 @@ #define DMIPSPLLCFG_N2_SHIFT 29 #define DMIPSPLLCFG_N2_MASK (0x7 << DMIPSPLLCFG_N2_SHIFT) @@ -982,7 +982,7 @@ obj-y += boards/ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -33,6 +33,7 @@ +@@ -30,6 +30,7 @@ #include #include #include @@ -990,7 +990,7 @@ #include #define PFX "board_bcm963xx: " -@@ -1587,6 +1588,9 @@ int __init board_register_devices(void) +@@ -1024,6 +1025,9 @@ int __init board_register_devices(void) if (board.num_spis) spi_register_board_info(board.spis, board.num_spis); diff --git a/target/linux/brcm63xx/patches-2.6.37/220-board-D4PW.patch b/target/linux/brcm63xx/patches-2.6.37/250-board-D4PW.patch similarity index 87% rename from target/linux/brcm63xx/patches-2.6.37/220-board-D4PW.patch rename to target/linux/brcm63xx/patches-2.6.37/250-board-D4PW.patch index 1e630d16a2..0a710f608d 100644 --- a/target/linux/brcm63xx/patches-2.6.37/220-board-D4PW.patch +++ b/target/linux/brcm63xx/patches-2.6.37/250-board-D4PW.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -464,6 +464,49 @@ static struct board_info __initdata boar +@@ -472,6 +472,49 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; @@ -50,7 +50,7 @@ #endif /* -@@ -728,6 +771,7 @@ static const struct board_info __initdat +@@ -736,6 +779,7 @@ static const struct board_info __initdat &board_DV201AMR, &board_96348gw_a, &board_rta1025w_16, diff --git a/target/linux/brcm63xx/patches-2.6.37/221-board-NB4.patch b/target/linux/brcm63xx/patches-2.6.37/260-board-NB4.patch similarity index 98% rename from target/linux/brcm63xx/patches-2.6.37/221-board-NB4.patch rename to target/linux/brcm63xx/patches-2.6.37/260-board-NB4.patch index c2d1056627..88122bb190 100644 --- a/target/linux/brcm63xx/patches-2.6.37/221-board-NB4.patch +++ b/target/linux/brcm63xx/patches-2.6.37/260-board-NB4.patch @@ -10,7 +10,7 @@ #include #include #include -@@ -34,6 +37,12 @@ +@@ -35,6 +38,12 @@ #define PFX "board_bcm963xx: " @@ -23,7 +23,7 @@ static struct bcm963xx_nvram nvram; static unsigned int mac_addr_used; static struct board_info board; -@@ -749,6 +758,502 @@ static struct board_info __initdata boar +@@ -757,6 +766,502 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; @@ -526,7 +526,7 @@ #endif /* -@@ -779,9 +1284,30 @@ static const struct board_info __initdat +@@ -787,9 +1292,30 @@ static const struct board_info __initdat &board_96358vw2, &board_AGPFS0, &board_DWVS0, @@ -557,7 +557,7 @@ /* * Register a sane SPROMv2 to make the on-board * bcm4318 WLAN work -@@ -899,6 +1425,9 @@ void __init board_prom_init(void) +@@ -908,6 +1434,9 @@ void __init board_prom_init(void) return; } diff --git a/target/linux/brcm63xx/patches-2.6.37/270-board-96338W2_E7T.patch b/target/linux/brcm63xx/patches-2.6.37/270-board-96338W2_E7T.patch index c6bd1c8693..179a146173 100644 --- a/target/linux/brcm63xx/patches-2.6.37/270-board-96338W2_E7T.patch +++ b/target/linux/brcm63xx/patches-2.6.37/270-board-96338W2_E7T.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -135,6 +135,38 @@ static struct board_info __initdata boar +@@ -142,6 +142,38 @@ static struct board_info __initdata boar }, }, }; @@ -39,7 +39,7 @@ #endif /* -@@ -1264,6 +1296,7 @@ static const struct board_info __initdat +@@ -1271,6 +1303,7 @@ static const struct board_info __initdat #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, &board_96338w, diff --git a/target/linux/brcm63xx/patches-2.6.37/310-CPVA642_board.patch b/target/linux/brcm63xx/patches-2.6.37/310-board-CPVA642.patch similarity index 100% rename from target/linux/brcm63xx/patches-2.6.37/310-CPVA642_board.patch rename to target/linux/brcm63xx/patches-2.6.37/310-board-CPVA642.patch diff --git a/target/linux/brcm63xx/patches-2.6.37/980-board_BTV2110.patch b/target/linux/brcm63xx/patches-2.6.37/455-board_BTV2110.patch similarity index 94% rename from target/linux/brcm63xx/patches-2.6.37/980-board_BTV2110.patch rename to target/linux/brcm63xx/patches-2.6.37/455-board_BTV2110.patch index 95b2b33bb6..505fb819bd 100644 --- a/target/linux/brcm63xx/patches-2.6.37/980-board_BTV2110.patch +++ b/target/linux/brcm63xx/patches-2.6.37/455-board_BTV2110.patch @@ -63,11 +63,11 @@ static struct board_info __initdata board_96348gw = { .name = "96348GW", .expected_cpu_id = 0x6348, -@@ -1933,6 +1989,7 @@ static const struct board_info __initdat +@@ -2009,6 +2065,7 @@ static const struct board_info __initdat &board_96348_D4PW, &board_spw500v, &board_ct536_ct5621, + &board_V2110, &board_96348sv, + &board_V2500V_BB, #endif - diff --git a/target/linux/brcm63xx/patches-2.6.37/170-board_livebox.patch b/target/linux/brcm63xx/patches-2.6.37/456-board_livebox.patch similarity index 100% rename from target/linux/brcm63xx/patches-2.6.37/170-board_livebox.patch rename to target/linux/brcm63xx/patches-2.6.37/456-board_livebox.patch diff --git a/target/linux/brcm63xx/patches-2.6.37/500-ssb-add-callback-for-sprom.patch b/target/linux/brcm63xx/patches-2.6.37/500-ssb-add-callback-for-sprom.patch index ef77c6963a..349e5f5007 100644 --- a/target/linux/brcm63xx/patches-2.6.37/500-ssb-add-callback-for-sprom.patch +++ b/target/linux/brcm63xx/patches-2.6.37/500-ssb-add-callback-for-sprom.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2071,6 +2071,17 @@ static struct ssb_sprom bcm63xx_sprom = +@@ -2128,6 +2128,17 @@ static struct ssb_sprom bcm63xx_sprom = .boardflags_lo = 0x2848, .boardflags_hi = 0x0000, }; @@ -18,7 +18,7 @@ #endif /* -@@ -2271,8 +2282,9 @@ void __init board_prom_init(void) +@@ -2328,8 +2339,9 @@ void __init board_prom_init(void) if (!board_get_mac_address(bcm63xx_sprom.il0mac)) { memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN); memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN); diff --git a/target/linux/brcm63xx/patches-2.6.37/977-ssb_export_fallback_sprom.patch b/target/linux/brcm63xx/patches-2.6.37/977-ssb_export_fallback_sprom.patch index 8f92945990..478019d99e 100644 --- a/target/linux/brcm63xx/patches-2.6.37/977-ssb_export_fallback_sprom.patch +++ b/target/linux/brcm63xx/patches-2.6.37/977-ssb_export_fallback_sprom.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2051,7 +2051,7 @@ static void __init nb4_nvram_fixup(void) +@@ -2108,7 +2108,7 @@ static void __init nb4_nvram_fixup(void) * bcm4318 WLAN work */ #ifdef CONFIG_SSB_PCIHOST @@ -9,7 +9,7 @@ .revision = 0x02, .board_rev = 0x17, .country_code = 0x0, -@@ -2071,6 +2071,7 @@ static struct ssb_sprom bcm63xx_sprom = +@@ -2128,6 +2128,7 @@ static struct ssb_sprom bcm63xx_sprom = .boardflags_lo = 0x2848, .boardflags_hi = 0x0000, };