KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixup patches after r27234

Browse source 
SVN-Revision: 27235
This commit is contained in:
Florian Fainelli 2011-06-19 20:28:38 +00:00
parent 7819b530da
commit 4dd4cbeb43
17 changed files with 40 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/linux/brcm63xx/patches-2.6.39/007-usb-ohci-support.patch
View file

@ -52,7 +52,7 @@ Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
#include <board_bcm963xx.h> #include <board_bcm963xx.h>
#define PFX "board_bcm963xx: " #define PFX "board_bcm963xx: "
@@ -871,6 +872,9 @@ int __init board_register_devices(void) @@ -877,6 +878,9 @@ int __init board_register_devices(void)
!board_get_mac_address(board.enet1.mac_addr)) !board_get_mac_address(board.enet1.mac_addr))
bcm63xx_enet_register(1, &board.enet1); bcm63xx_enet_register(1, &board.enet1);

2
target/linux/brcm63xx/patches-2.6.39/008-usb-ehci-support.patch
View file

@ -44,7 +44,7 @@ Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
#include <board_bcm963xx.h> #include <board_bcm963xx.h>
#define PFX "board_bcm963xx: " #define PFX "board_bcm963xx: "
@@ -872,6 +873,9 @@ int __init board_register_devices(void) @@ -878,6 +879,9 @@ int __init board_register_devices(void)
!board_get_mac_address(board.enet1.mac_addr)) !board_get_mac_address(board.enet1.mac_addr))
bcm63xx_enet_register(1, &board.enet1); bcm63xx_enet_register(1, &board.enet1);

4
target/linux/brcm63xx/patches-2.6.39/040-bcm963xx_flashmap.patch
View file

@ -12,7 +12,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
--- 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
@@ -810,20 +810,6 @@ void __init board_setup(void) @@ -816,20 +816,6 @@ void __init board_setup(void)
panic("unexpected CPU for bcm963xx board"); panic("unexpected CPU for bcm963xx board");
} }
@ -33,7 +33,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
static struct resource mtd_resources[] = { static struct resource mtd_resources[] = {
{ {
.start = 0, /* filled at runtime */ .start = 0, /* filled at runtime */
@@ -833,12 +819,9 @@ static struct resource mtd_resources[] = @@ -839,12 +825,9 @@ static struct resource mtd_resources[] =
}; };
static struct platform_device mtd_dev = { static struct platform_device mtd_dev = {

4
target/linux/brcm63xx/patches-2.6.39/100-reset_buttons.patch
View file

@ -43,7 +43,7 @@
}; };
static struct board_info __initdata board_FAST2404 = { static struct board_info __initdata board_FAST2404 = {
@@ -832,12 +854,23 @@ static struct platform_device bcm63xx_gp @@ -838,12 +860,23 @@ static struct platform_device bcm63xx_gp
.dev.platform_data = &bcm63xx_led_data, .dev.platform_data = &bcm63xx_led_data,
}; };
@ -67,7 +67,7 @@
if (board.has_uart0) if (board.has_uart0)
bcm63xx_uart_register(0); bcm63xx_uart_register(0);
@@ -879,5 +912,16 @@ int __init board_register_devices(void) @@ -888,5 +921,16 @@ int __init board_register_devices(void)
platform_device_register(&bcm63xx_gpio_leds); platform_device_register(&bcm63xx_gpio_leds);

4
target/linux/brcm63xx/patches-2.6.39/110-gpiodev.patch
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
@@ -846,6 +846,10 @@ static struct platform_device mtd_dev = @@ -852,6 +852,10 @@ static struct platform_device mtd_dev =
.num_resources = ARRAY_SIZE(mtd_resources), .num_resources = ARRAY_SIZE(mtd_resources),
}; };
@ -11,7 +11,7 @@
static struct gpio_led_platform_data bcm63xx_led_data; static struct gpio_led_platform_data bcm63xx_led_data;
static struct platform_device bcm63xx_gpio_leds = { static struct platform_device bcm63xx_gpio_leds = {
@@ -907,6 +911,8 @@ int __init board_register_devices(void) @@ -916,6 +920,8 @@ int __init board_register_devices(void)
platform_device_register(&mtd_dev); platform_device_register(&mtd_dev);

4
target/linux/brcm63xx/patches-2.6.39/141-led_count.patch
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
@@ -875,6 +875,7 @@ int __init board_register_devices(void) @@ -881,6 +881,7 @@ int __init board_register_devices(void)
{ {
u32 val; u32 val;
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);
@@ -913,7 +914,11 @@ int __init board_register_devices(void) @@ -922,7 +923,11 @@ int __init board_register_devices(void)
platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1); platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1);

6
target/linux/brcm63xx/patches-2.6.39/180-udc_preliminary_support.patch
View file

@ -17,7 +17,7 @@
}; };
static struct board_info __initdata board_rta1025w_16 = { static struct board_info __initdata board_rta1025w_16 = {
@@ -903,6 +906,9 @@ int __init board_register_devices(void) @@ -909,6 +912,9 @@ int __init board_register_devices(void)
if (board.has_dsp) if (board.has_dsp)
bcm63xx_dsp_register(&board.dsp); bcm63xx_dsp_register(&board.dsp);
@ -25,8 +25,8 @@
+ bcm63xx_udc_register(); + bcm63xx_udc_register();
+ +
/* read base address of boot chip select (0) */ /* read base address of boot chip select (0) */
val = bcm_mpi_readl(MPI_CSBASE_REG(0)); if (BCMCPU_IS_6345())
val &= MPI_CSBASE_BASE_MASK; val = 0x1fc00000;
--- /dev/null --- /dev/null
+++ b/arch/mips/bcm63xx/dev-usb-udc.c +++ b/arch/mips/bcm63xx/dev-usb-udc.c
@@ -0,0 +1,58 @@ @@ -0,0 +1,58 @@

6
target/linux/brcm63xx/patches-2.6.39/200-extended-platform-devices.patch
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
@@ -909,6 +909,9 @@ int __init board_register_devices(void) @@ -915,6 +915,9 @@ int __init board_register_devices(void)
if (board.has_udc0) if (board.has_udc0)
bcm63xx_udc_register(); bcm63xx_udc_register();
@ -8,8 +8,8 @@
+ platform_add_devices(board.devs, board.num_devs); + platform_add_devices(board.devs, board.num_devs);
+ +
/* read base address of boot chip select (0) */ /* read base address of boot chip select (0) */
val = bcm_mpi_readl(MPI_CSBASE_REG(0)); if (BCMCPU_IS_6345())
val &= MPI_CSBASE_BASE_MASK; val = 0x1fc00000;
--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
@@ -61,6 +61,10 @@ struct board_info { @@ -61,6 +61,10 @@ struct board_info {

6
target/linux/brcm63xx/patches-2.6.39/200-spi-board-info.patch
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
@@ -912,6 +912,9 @@ int __init board_register_devices(void) @@ -918,6 +918,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);
@ -8,8 +8,8 @@
+ spi_register_board_info(board.spis, board.num_spis); + spi_register_board_info(board.spis, board.num_spis);
+ +
/* read base address of boot chip select (0) */ /* read base address of boot chip select (0) */
val = bcm_mpi_readl(MPI_CSBASE_REG(0)); if (BCMCPU_IS_6345())
val &= MPI_CSBASE_BASE_MASK; val = 0x1fc00000;
--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
@@ -65,6 +65,10 @@ struct board_info { @@ -65,6 +65,10 @@ struct board_info {

2
target/linux/brcm63xx/patches-2.6.39/220-wl_exports.patch
View file

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

4
target/linux/brcm63xx/patches-2.6.39/230-6358-enet1-external-mii-clk.patch
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
@@ -812,6 +812,8 @@ void __init board_prom_init(void) @@ -818,6 +818,8 @@ void __init board_prom_init(void)
if (BCMCPU_IS_6348()) if (BCMCPU_IS_6348())
val |= GPIO_MODE_6348_G3_EXT_MII | val |= GPIO_MODE_6348_G3_EXT_MII |
GPIO_MODE_6348_G0_EXT_MII; GPIO_MODE_6348_G0_EXT_MII;
@ -11,7 +11,7 @@
bcm_gpio_writel(val, GPIO_MODE_REG); bcm_gpio_writel(val, GPIO_MODE_REG);
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
@@ -401,6 +401,8 @@ @@ -402,6 +402,8 @@
#define GPIO_MODE_6358_EXTRA_SPI_SS (1 << 7) #define GPIO_MODE_6358_EXTRA_SPI_SS (1 << 7)
#define GPIO_MODE_6358_SERIAL_LED (1 << 10) #define GPIO_MODE_6358_SERIAL_LED (1 << 10)
#define GPIO_MODE_6358_UTOPIA (1 << 12) #define GPIO_MODE_6358_UTOPIA (1 << 12)

8
target/linux/brcm63xx/patches-2.6.39/240-spi.patch
View file

@ -200,7 +200,7 @@
#define BCM_6358_OHCI0_IRQ (IRQ_INTERNAL_BASE + 5) #define BCM_6358_OHCI0_IRQ (IRQ_INTERNAL_BASE + 5)
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
@@ -805,4 +805,116 @@ @@ -771,4 +771,116 @@
#define DMIPSPLLCFG_N2_SHIFT 29 #define DMIPSPLLCFG_N2_SHIFT 29
#define DMIPSPLLCFG_N2_MASK (0x7 << DMIPSPLLCFG_N2_SHIFT) #define DMIPSPLLCFG_N2_MASK (0x7 << DMIPSPLLCFG_N2_SHIFT)
@ -990,7 +990,7 @@
#include <board_bcm963xx.h> #include <board_bcm963xx.h>
#define PFX "board_bcm963xx: " #define PFX "board_bcm963xx: "
@@ -925,6 +926,9 @@ int __init board_register_devices(void) @@ -931,6 +932,9 @@ int __init board_register_devices(void)
if (board.num_spis) if (board.num_spis)
spi_register_board_info(board.spis, board.num_spis); spi_register_board_info(board.spis, board.num_spis);
@ -998,5 +998,5 @@
+ bcm63xx_spi_register(); + bcm63xx_spi_register();
+ +
/* read base address of boot chip select (0) */ /* read base address of boot chip select (0) */
val = bcm_mpi_readl(MPI_CSBASE_REG(0)); if (BCMCPU_IS_6345())
val &= MPI_CSBASE_BASE_MASK; val = 0x1fc00000;

2
target/linux/brcm63xx/patches-2.6.39/250-boardid_fixup.patch
View file

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

2
target/linux/brcm63xx/patches-2.6.39/441-board-NB4.patch
View file

@ -557,7 +557,7 @@
/* /*
* Register a sane SPROMv2 to make the on-board * Register a sane SPROMv2 to make the on-board
* bcm4318 WLAN work * bcm4318 WLAN work
@@ -953,6 +1479,9 @@ void __init board_prom_init(void) @@ -959,6 +1485,9 @@ void __init board_prom_init(void)
boardid_fixup(boot_addr); boardid_fixup(boot_addr);
} }

9
target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch
View file

@ -72,9 +72,9 @@
#endif #endif
#ifdef CONFIG_BCM63XX_CPU_6358 #ifdef CONFIG_BCM63XX_CPU_6358
@@ -2051,6 +2109,22 @@ void __init board_prom_init(void) @@ -2057,6 +2115,22 @@ void __init board_prom_init(void)
val = bcm_mpi_readl(MPI_CSBASE_REG(0));
val &= MPI_CSBASE_BASE_MASK; val &= MPI_CSBASE_BASE_MASK;
}
boot_addr = (u8 *)KSEG1ADDR(val); boot_addr = (u8 *)KSEG1ADDR(val);
+ printk(KERN_INFO PFX "Boot address 0x%08x\n",(unsigned int)boot_addr); + printk(KERN_INFO PFX "Boot address 0x%08x\n",(unsigned int)boot_addr);
+ +
@ -95,10 +95,11 @@
/* dump cfe version */ /* dump cfe version */
cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET; cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
@@ -2255,6 +2329,13 @@ 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 = bcm_mpi_readl(MPI_CSBASE_REG(0));
val &= MPI_CSBASE_BASE_MASK; val &= MPI_CSBASE_BASE_MASK;
}
+
+ /* BT Voyager 2500V has 8 Meg flash in two 4 Meg banks + /* BT Voyager 2500V has 8 Meg flash in two 4 Meg banks
+ * Loading from CFE always uses Bank 0 */ + * Loading from CFE always uses Bank 0 */
+ if (!strcmp(board.name, "V2500V_BB")) { + if (!strcmp(board.name, "V2500V_BB")) {

4
target/linux/brcm63xx/patches-2.6.39/500-ssb-add-callback-for-sprom.patch
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
@@ -2136,6 +2136,17 @@ static struct ssb_sprom bcm63xx_sprom = @@ -2128,6 +2128,17 @@ static struct ssb_sprom bcm63xx_sprom =
.boardflags_lo = 0x2848, .boardflags_lo = 0x2848,
.boardflags_hi = 0x0000, .boardflags_hi = 0x0000,
}; };
@ -18,7 +18,7 @@
#endif #endif
/* /*
@@ -2330,8 +2341,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)) { if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN); memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN); memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);

4
target/linux/brcm63xx/patches-2.6.39/977-ssb_export_fallback_sprom.patch
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
@@ -2116,7 +2116,7 @@ static void __init nb4_nvram_fixup(void) @@ -2108,7 +2108,7 @@ static void __init nb4_nvram_fixup(void)
* bcm4318 WLAN work * bcm4318 WLAN work
*/ */
#ifdef CONFIG_SSB_PCIHOST #ifdef CONFIG_SSB_PCIHOST
@ -9,7 +9,7 @@
.revision = 0x02, .revision = 0x02,
.board_rev = 0x17, .board_rev = 0x17,
.country_code = 0x0, .country_code = 0x0,
@@ -2136,6 +2136,7 @@ static struct ssb_sprom bcm63xx_sprom = @@ -2128,6 +2128,7 @@ static struct ssb_sprom bcm63xx_sprom =
.boardflags_lo = 0x2848, .boardflags_lo = 0x2848,
.boardflags_hi = 0x0000, .boardflags_hi = 0x0000,
}; };