renumber patches accordingly

SVN-Revision: 27013

target/linux/brcm63xx/patches-2.6.37/180-udc_preliminary_support.patch

@@ -17,7 +17,7 @@
  };
  
  static struct board_info __initdata board_rta1025w_16 = {
-@@ -1002,6 +1005,9 @@ int __init board_register_devices(void)
+@@ -909,6 +912,9 @@ int __init board_register_devices(void)
  	if (board.has_dsp)
  		bcm63xx_dsp_register(&board.dsp);
  

target/linux/brcm63xx/patches-2.6.37/200-extended-platform-devices.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1008,6 +1008,9 @@ int __init board_register_devices(void)
+@@ -915,6 +915,9 @@ int __init board_register_devices(void)
  	if (board.has_udc0)
  		bcm63xx_udc_register();
  

target/linux/brcm63xx/patches-2.6.37/200-spi-board-info.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1011,6 +1011,9 @@ int __init board_register_devices(void)
+@@ -918,6 +918,9 @@ int __init board_register_devices(void)
  	if (board.num_devs)
  		platform_add_devices(board.devs, board.num_devs);
  

target/linux/brcm63xx/patches-2.6.37/220-wl_exports.patch

@@ -14,7 +14,7 @@
   * known 6338 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6338
-@@ -840,6 +847,7 @@ void __init board_prom_init(void)
+@@ -747,6 +754,7 @@ void __init board_prom_init(void)
  
  	/* extract nvram data */
  	memcpy(&nvram, boot_addr + BCM963XX_NVRAM_OFFSET, sizeof(nvram));

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
-@@ -911,6 +911,8 @@ void __init board_prom_init(void)
+@@ -818,6 +818,8 @@ void __init board_prom_init(void)
  		if (BCMCPU_IS_6348())
  			val |= GPIO_MODE_6348_G3_EXT_MII |
  				GPIO_MODE_6348_G0_EXT_MII;

target/linux/brcm63xx/patches-2.6.37/240-spi.patch

@@ -990,7 +990,7 @@
  #include <board_bcm963xx.h>
  
  #define PFX	"board_bcm963xx: "
-@@ -1024,6 +1025,9 @@ int __init board_register_devices(void)
+@@ -931,6 +932,9 @@ int __init board_register_devices(void)
  	if (board.num_spis)
  		spi_register_board_info(board.spis, board.num_spis);
  

target/linux/brcm63xx/patches-2.6.37/250-boardid_fixup.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -35,6 +35,7 @@
+@@ -32,9 +32,13 @@
  #include <bcm63xx_dev_usb_udc.h>
  #include <bcm63xx_dev_spi.h>
  #include <board_bcm963xx.h>
@@ -8,17 +8,13 @@
  
  #define PFX	"board_bcm963xx: "
  
-@@ -44,6 +45,9 @@
- #define NB4_SPI_GPIO_CLK	6
- #define NB4_74HC64_GPIO(X)	(NB4_74X164_GPIO_BASE + (X))
- 
 +#define CFE_OFFSET_64K		0x10000
 +#define CFE_OFFSET_128K		0x20000
 +
  static struct bcm963xx_nvram nvram;
  static unsigned int mac_addr_used;
  static struct board_info board;
-@@ -1566,6 +1570,29 @@ static int board_get_mac_address(u8 *mac
+@@ -723,6 +727,29 @@ static int board_get_mac_address(u8 *mac
  	return 0;
  }
  
@@ -48,9 +44,9 @@
  /*
   * early init callback, read nvram data from flash and checksum it
   */
-@@ -1617,6 +1644,11 @@ void __init board_prom_init(void)
- 	/* Fixup broken nb4 board name */
- 	nb4_nvram_fixup();
+@@ -771,6 +798,11 @@ void __init board_prom_init(void)
+ 		return;
+ 	}
  
 +	if (strcmp(cfe_version, "unknown") != 0) {
 +		/* cfe present */

target/linux/brcm63xx/patches-2.6.37/300-alice_gate2_leds.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -588,6 +588,99 @@ static struct board_info __initdata boar
+@@ -603,6 +603,99 @@ static struct board_info __initdata boar
  
  	.has_ohci0 = 1,
  	.has_ehci0 = 1,
@@ -102,7 +102,7 @@
  static struct board_info __initdata board_DWVS0 = {
 --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
 +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -56,7 +56,7 @@ struct board_info {
+@@ -57,7 +57,7 @@ struct board_info {
  	struct bcm63xx_dsp_platform_data dsp;
  
  	/* GPIO LEDs */

target/linux/brcm63xx/patches-2.6.37/310-96348gw_a_leds.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -670,6 +670,19 @@ static struct board_info __initdata boar
+@@ -475,6 +475,19 @@ static struct board_info __initdata boar
  	},
  
  	.has_ohci0 = 1,
@@ -18,5 +18,5 @@
 +		}
 +	},
  };
+ #endif
  
- static struct board_info __initdata board_96348_D4PW = {

target/linux/brcm63xx/patches-2.6.37/440-board-D4PW.patch

@@ -1,8 +1,8 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -472,6 +472,49 @@ static struct board_info __initdata boar
- 
- 	.has_ohci0 = 1,
+@@ -489,6 +489,49 @@ static struct board_info __initdata boar
+ 		}
+ 	},
  };
 +
 +static struct board_info __initdata board_96348_D4PW = {
@@ -50,7 +50,7 @@
  #endif
  
  /*
-@@ -736,6 +779,7 @@ static const struct board_info __initdat
+@@ -753,6 +796,7 @@ static const struct board_info __initdat
  	&board_DV201AMR,
  	&board_96348gw_a,
  	&board_rta1025w_16,

target/linux/brcm63xx/patches-2.6.37/441-board-NB4.patch

@@ -10,9 +10,9 @@
  #include <asm/addrspace.h>
  #include <bcm63xx_board.h>
  #include <bcm63xx_cpu.h>
-@@ -35,6 +38,12 @@
- 
- #define PFX	"board_bcm963xx: "
+@@ -39,6 +42,12 @@
+ #define CFE_OFFSET_64K		0x10000
+ #define CFE_OFFSET_128K		0x20000
  
 +#define NB4_PID_OFFSET		0xff80
 +#define NB4_74X164_GPIO_BASE	64
@@ -23,7 +23,7 @@
  static struct bcm963xx_nvram nvram;
  static unsigned int mac_addr_used;
  static struct board_info board;
-@@ -757,6 +766,502 @@ static struct board_info __initdata boar
+@@ -774,6 +783,502 @@ static struct board_info __initdata boar
  
  	.has_ohci0			= 1,
  };
@@ -526,7 +526,7 @@
  #endif
  
  /*
-@@ -787,9 +1292,30 @@ static const struct board_info __initdat
+@@ -804,9 +1309,30 @@ static const struct board_info __initdat
  	&board_96358vw2,
  	&board_AGPFS0,
  	&board_DWVS0,
@@ -557,8 +557,8 @@
  /*
   * Register a sane SPROMv2 to make the on-board
   * bcm4318 WLAN work
-@@ -908,6 +1434,9 @@ void __init board_prom_init(void)
- 		return;
+@@ -953,6 +1479,9 @@ void __init board_prom_init(void)
+ 		boardid_fixup(boot_addr);
  	}
  
 +	/* Fixup broken nb4 board name */

target/linux/brcm63xx/patches-2.6.37/442-board-96338W2_E7T.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -142,6 +142,38 @@ static struct board_info __initdata boar
+@@ -146,6 +146,38 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -39,7 +39,7 @@
  #endif
  
  /*
-@@ -1271,6 +1303,7 @@ static const struct board_info __initdat
+@@ -1288,6 +1320,7 @@ static const struct board_info __initdat
  #ifdef CONFIG_BCM63XX_CPU_6338
  	&board_96338gw,
  	&board_96338w,

target/linux/brcm63xx/patches-2.6.37/443-board-CPVA642.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -662,6 +662,98 @@ static struct board_info __initdata boar
+@@ -679,6 +679,98 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -99,7 +99,7 @@
  static struct board_info __initdata board_AGPFS0 = {
  	.name                           = "AGPF-S0",
  	.expected_cpu_id                = 0x6358,
-@@ -1324,6 +1416,7 @@ static const struct board_info __initdat
+@@ -1341,6 +1433,7 @@ static const struct board_info __initdat
  	&board_96358vw,
  	&board_96358vw2,
  	&board_AGPFS0,

target/linux/brcm63xx/patches-2.6.37/444-board_dsl_274xb_rev_c.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -891,6 +891,59 @@ static struct board_info __initdata boar
+@@ -908,6 +908,59 @@ static struct board_info __initdata boar
  	.has_ohci0			= 1,
  };
  
@@ -60,7 +60,7 @@
  struct spi_gpio_platform_data nb4_spi_gpio_data = {
  	.sck		= NB4_SPI_GPIO_CLK,
  	.mosi		= NB4_SPI_GPIO_MOSI,
-@@ -1418,6 +1471,7 @@ static const struct board_info __initdat
+@@ -1435,6 +1488,7 @@ static const struct board_info __initdat
  	&board_AGPFS0,
  	&board_CPVA642,
  	&board_DWVS0,

target/linux/brcm63xx/patches-2.6.37/445-board_spw500v.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -560,6 +560,67 @@ static struct board_info __initdata boar
+@@ -573,6 +573,67 @@ static struct board_info __initdata boar
  
  };
  
@@ -68,7 +68,7 @@
  #endif
  
  /*
-@@ -1467,6 +1528,7 @@ static const struct board_info __initdat
+@@ -1480,6 +1541,7 @@ static const struct board_info __initdat
  	&board_96348gw_a,
  	&board_rta1025w_16,
  	&board_96348_D4PW,

target/linux/brcm63xx/patches-2.6.37/446-board-D4PW_correction.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -522,42 +522,48 @@ static struct board_info __initdata boar
+@@ -535,42 +535,48 @@ static struct board_info __initdata boar
  	.name				= "D-4P-W",
  	.expected_cpu_id		= 0x6348,
  

target/linux/brcm63xx/patches-2.6.37/447-board_gw6200_gw6000.patch

@@ -118,7 +118,7 @@
  static struct board_info __initdata board_FAST2404 = {
  	.name				= "F@ST2404",
  	.expected_cpu_id		= 0x6348,
-@@ -1527,6 +1638,8 @@ static const struct board_info __initdat
+@@ -1540,6 +1651,8 @@ static const struct board_info __initdat
  #ifdef CONFIG_BCM63XX_CPU_6348
  	&board_96348r,
  	&board_96348gw,

target/linux/brcm63xx/patches-2.6.37/448-board-MAGIC.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -794,6 +794,76 @@ static struct board_info __initdata boar
+@@ -751,6 +751,76 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -77,10 +77,10 @@
  #endif
  
  /*
-@@ -1705,6 +1775,7 @@ static const struct board_info __initdat
+@@ -1661,6 +1731,7 @@ static const struct board_info __initdat
+ 	&board_rta1025w_16,
  	&board_96348_D4PW,
  	&board_spw500v,
- 	&board_ct536_ct5621,
 +	&board_96348sv,
  #endif
  

target/linux/brcm63xx/patches-2.6.37/449-board_hw553.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1749,6 +1749,79 @@ static struct board_info __initdata boar
+@@ -1706,6 +1706,79 @@ static struct board_info __initdata boar
  };
  #endif
  
@@ -80,7 +80,7 @@
  /*
   * all boards
   */
-@@ -1790,6 +1863,7 @@ static const struct board_info __initdat
+@@ -1746,6 +1819,7 @@ static const struct board_info __initdat
  	&board_nb4_ser_r2,
  	&board_nb4_fxc_r1,
  	&board_nb4_fxc_r2,

target/linux/brcm63xx/patches-2.6.37/450-board_rta1320_16m.patch

@@ -44,7 +44,7 @@
  #endif
  
  /*
-@@ -1830,6 +1867,7 @@ static const struct board_info __initdat
+@@ -1787,6 +1824,7 @@ static const struct board_info __initdat
  	&board_96338gw,
  	&board_96338w,
  	&board_96338w2_e7t,

target/linux/brcm63xx/patches-2.6.37/451-board_spw303v.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1784,6 +1784,72 @@ static struct board_info __initdata boar
+@@ -1741,6 +1741,72 @@ static struct board_info __initdata boar
  	.spis = nb4_spi_devices,
  	.num_spis = ARRAY_SIZE(nb4_spi_devices),
  };
@@ -73,7 +73,7 @@
  #endif
  
  static struct board_info __initdata board_HW553 = {
-@@ -1902,6 +1968,7 @@ static const struct board_info __initdat
+@@ -1858,6 +1924,7 @@ static const struct board_info __initdat
  	&board_nb4_fxc_r1,
  	&board_nb4_fxc_r2,
  	&board_HW553,

target/linux/brcm63xx/patches-2.6.37/452-board_V2500V.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -901,6 +901,63 @@ static struct board_info __initdata boar
+@@ -858,6 +858,63 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -64,15 +64,15 @@
  #endif
  
  /*
-@@ -1953,6 +2010,7 @@ static const struct board_info __initdat
+@@ -1909,6 +1966,7 @@ static const struct board_info __initdat
+ 	&board_96348_D4PW,
  	&board_spw500v,
- 	&board_ct536_ct5621,
  	&board_96348sv,
 +	&board_V2500V_BB,
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -2101,6 +2159,22 @@ void __init board_prom_init(void)
+@@ -2057,6 +2115,22 @@ void __init board_prom_init(void)
  		val &= MPI_CSBASE_BASE_MASK;
  	}
  	boot_addr = (u8 *)KSEG1ADDR(val);
@@ -95,7 +95,7 @@
  
  	/* dump cfe version */
  	cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
-@@ -2308,6 +2382,14 @@ int __init board_register_devices(void)
+@@ -2264,6 +2338,14 @@ int __init board_register_devices(void)
  		val = bcm_mpi_readl(MPI_CSBASE_REG(0));
  		val &= MPI_CSBASE_BASE_MASK;
  	}

target/linux/brcm63xx/patches-2.6.37/453-board_BTV2110.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -444,6 +444,62 @@ static struct board_info __initdata boar
+@@ -401,6 +401,62 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -63,11 +63,11 @@
  static struct board_info __initdata board_96348gw = {
  	.name				= "96348GW",
  	.expected_cpu_id		= 0x6348,
-@@ -2009,6 +2065,7 @@ static const struct board_info __initdat
- 	&board_96348_D4PW,
+@@ -1967,6 +2023,7 @@ static const struct board_info __initdat
  	&board_spw500v,
- 	&board_ct536_ct5621,
-+	&board_V2110,
  	&board_96348sv,
  	&board_V2500V_BB,
++	&board_V2110,
  #endif
+ 
+ #ifdef CONFIG_BCM63XX_CPU_6358

target/linux/brcm63xx/patches-2.6.37/455-board_ct536_ct5621.patch

@@ -1,9 +1,9 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -364,6 +364,49 @@ static struct board_info __initdata boar
- 	},
+@@ -457,6 +457,49 @@ static struct board_info __initdata boar
  };
  
+ 
 +static struct board_info __initdata board_ct536_ct5621 = {
 +	.name				= "CT536_CT5621",
 +	.expected_cpu_id		= 0x6348,
@@ -50,10 +50,10 @@
  static struct board_info __initdata board_96348gw = {
  	.name				= "96348GW",
  	.expected_cpu_id		= 0x6348,
-@@ -1648,6 +1691,7 @@ static const struct board_info __initdat
- 	&board_rta1025w_16,
- 	&board_96348_D4PW,
- 	&board_spw500v,
+@@ -2024,6 +2067,7 @@ static const struct board_info __initdat
+ 	&board_96348sv,
+ 	&board_V2500V_BB,
+ 	&board_V2110,
 +	&board_ct536_ct5621,
  #endif