Changeset 27232


Ignore:
Timestamp:
2011-06-19T22:12:45+02:00 (7 years ago)
Author:
florian
Message:

[brcm63xx] switch to 2.6.39

Location:
trunk/target/linux/brcm63xx
Files:
6 added
20 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/brcm63xx/Makefile

    r26836 r27232  
    1111BOARDNAME:=Broadcom BCM63xx 
    1212FEATURES:=squashfs jffs2 usb atm pci pcmcia 
    13 LINUX_VERSION:=2.6.37.6 
     13LINUX_VERSION:=2.6.39.1 
    1414MAINTAINER:=Florian Fainelli <florian@openwrt.org> 
    1515 
  • trunk/target/linux/brcm63xx/patches-2.6.39/007-usb-ohci-support.patch

    r27019 r27232  
    5353  
    5454 #define PFX    "board_bcm963xx: " 
    55 @@ -877,6 +878,9 @@ int __init board_register_devices(void) 
     55@@ -871,6 +872,9 @@ int __init board_register_devices(void) 
    5656            !board_get_mac_address(board.enet1.mac_addr)) 
    5757                bcm63xx_enet_register(1, &board.enet1); 
  • trunk/target/linux/brcm63xx/patches-2.6.39/008-usb-ehci-support.patch

    r27019 r27232  
    4545  
    4646 #define PFX    "board_bcm963xx: " 
    47 @@ -878,6 +879,9 @@ int __init board_register_devices(void) 
     47@@ -872,6 +873,9 @@ int __init board_register_devices(void) 
    4848            !board_get_mac_address(board.enet1.mac_addr)) 
    4949                bcm63xx_enet_register(1, &board.enet1); 
  • trunk/target/linux/brcm63xx/patches-2.6.39/010-add_bcm63xx_ohci_controller.patch

    r27019 r27232  
    178178--- a/drivers/usb/host/ohci-hcd.c 
    179179+++ b/drivers/usb/host/ohci-hcd.c 
    180 @@ -1054,6 +1054,11 @@ MODULE_LICENSE ("GPL"); 
     180@@ -1056,6 +1056,11 @@ MODULE_LICENSE ("GPL"); 
    181181 #define PLATFORM_DRIVER                ohci_hcd_da8xx_driver 
    182182 #endif 
  • trunk/target/linux/brcm63xx/patches-2.6.39/011-add_bcm63xx_ehci_controller.patch

    r27019 r27232  
    165165--- a/drivers/usb/host/ehci-hcd.c 
    166166+++ b/drivers/usb/host/ehci-hcd.c 
    167 @@ -1265,6 +1265,11 @@ MODULE_LICENSE ("GPL"); 
     167@@ -1267,6 +1267,11 @@ MODULE_LICENSE ("GPL"); 
    168168 #define PLATFORM_DRIVER                tegra_ehci_driver 
    169169 #endif 
  • trunk/target/linux/brcm63xx/patches-2.6.39/040-bcm963xx_flashmap.patch

    r27019 r27232  
    1313--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    1414+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    15 @@ -816,20 +816,6 @@ void __init board_setup(void) 
     15@@ -810,20 +810,6 @@ void __init board_setup(void) 
    1616                panic("unexpected CPU for bcm963xx board"); 
    1717 } 
     
    3434        { 
    3535                .start          = 0,    /* filled at runtime */ 
    36 @@ -839,12 +825,9 @@ static struct resource mtd_resources[] = 
     36@@ -833,12 +819,9 @@ static struct resource mtd_resources[] = 
    3737 }; 
    3838  
  • trunk/target/linux/brcm63xx/patches-2.6.39/100-reset_buttons.patch

    r27019 r27232  
    4444  
    4545 static struct board_info __initdata board_FAST2404 = { 
    46 @@ -838,12 +860,23 @@ static struct platform_device bcm63xx_gp 
     46@@ -832,12 +854,23 @@ static struct platform_device bcm63xx_gp 
    4747        .dev.platform_data      = &bcm63xx_led_data, 
    4848 }; 
     
    6868        if (board.has_uart0) 
    6969                bcm63xx_uart_register(0); 
    70 @@ -888,5 +921,16 @@ int __init board_register_devices(void) 
     70@@ -879,5 +912,16 @@ int __init board_register_devices(void) 
    7171  
    7272        platform_device_register(&bcm63xx_gpio_leds); 
  • trunk/target/linux/brcm63xx/patches-2.6.39/110-gpiodev.patch

    r27019 r27232  
    11--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    22+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    3 @@ -852,6 +852,10 @@ static struct platform_device mtd_dev = 
     3@@ -846,6 +846,10 @@ static struct platform_device mtd_dev = 
    44        .num_resources          = ARRAY_SIZE(mtd_resources), 
    55 }; 
     
    1212  
    1313 static struct platform_device bcm63xx_gpio_leds = { 
    14 @@ -916,6 +920,8 @@ int __init board_register_devices(void) 
     14@@ -907,6 +911,8 @@ int __init board_register_devices(void) 
    1515  
    1616        platform_device_register(&mtd_dev); 
  • trunk/target/linux/brcm63xx/patches-2.6.39/141-led_count.patch

    r27019 r27232  
    11--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    22+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    3 @@ -881,6 +881,7 @@ int __init board_register_devices(void) 
     3@@ -875,6 +875,7 @@ int __init board_register_devices(void) 
    44 { 
    55        u32 val; 
     
    99        if (board.has_uart0) 
    1010                bcm63xx_uart_register(0); 
    11 @@ -922,7 +923,11 @@ int __init board_register_devices(void) 
     11@@ -913,7 +914,11 @@ int __init board_register_devices(void) 
    1212  
    1313        platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1); 
  • trunk/target/linux/brcm63xx/patches-2.6.39/180-udc_preliminary_support.patch

    r27019 r27232  
    1818  
    1919 static struct board_info __initdata board_rta1025w_16 = { 
    20 @@ -909,6 +912,9 @@ int __init board_register_devices(void) 
     20@@ -903,6 +906,9 @@ int __init board_register_devices(void) 
    2121        if (board.has_dsp) 
    2222                bcm63xx_dsp_register(&board.dsp); 
     
    2626+ 
    2727        /* read base address of boot chip select (0) */ 
    28         if (BCMCPU_IS_6345()) 
    29                 val = 0x1fc00000; 
     28        val = bcm_mpi_readl(MPI_CSBASE_REG(0)); 
     29        val &= MPI_CSBASE_BASE_MASK; 
    3030--- /dev/null 
    3131+++ b/arch/mips/bcm63xx/dev-usb-udc.c 
  • trunk/target/linux/brcm63xx/patches-2.6.39/200-extended-platform-devices.patch

    r27019 r27232  
    11--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    22+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    3 @@ -915,6 +915,9 @@ int __init board_register_devices(void) 
     3@@ -909,6 +909,9 @@ int __init board_register_devices(void) 
    44        if (board.has_udc0) 
    55                bcm63xx_udc_register(); 
     
    99+ 
    1010        /* read base address of boot chip select (0) */ 
    11         if (BCMCPU_IS_6345()) 
    12                 val = 0x1fc00000; 
     11        val = bcm_mpi_readl(MPI_CSBASE_REG(0)); 
     12        val &= MPI_CSBASE_BASE_MASK; 
    1313--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 
    1414+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 
  • trunk/target/linux/brcm63xx/patches-2.6.39/200-spi-board-info.patch

    r27019 r27232  
    11--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    22+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    3 @@ -918,6 +918,9 @@ int __init board_register_devices(void) 
     3@@ -912,6 +912,9 @@ int __init board_register_devices(void) 
    44        if (board.num_devs) 
    55                platform_add_devices(board.devs, board.num_devs); 
     
    99+ 
    1010        /* read base address of boot chip select (0) */ 
    11         if (BCMCPU_IS_6345()) 
    12                 val = 0x1fc00000; 
     11        val = bcm_mpi_readl(MPI_CSBASE_REG(0)); 
     12        val &= MPI_CSBASE_BASE_MASK; 
    1313--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 
    1414+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 
  • trunk/target/linux/brcm63xx/patches-2.6.39/220-wl_exports.patch

    r27019 r27232  
    1515  */ 
    1616 #ifdef CONFIG_BCM63XX_CPU_6338 
    17 @@ -747,6 +754,7 @@ void __init board_prom_init(void) 
     17@@ -741,6 +748,7 @@ void __init board_prom_init(void) 
    1818  
    1919        /* extract nvram data */ 
  • trunk/target/linux/brcm63xx/patches-2.6.39/230-6358-enet1-external-mii-clk.patch

    r27019 r27232  
    11--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    22+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    3 @@ -818,6 +818,8 @@ void __init board_prom_init(void) 
     3@@ -812,6 +812,8 @@ void __init board_prom_init(void) 
    44                if (BCMCPU_IS_6348()) 
    55                        val |= GPIO_MODE_6348_G3_EXT_MII | 
     
    1212--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h 
    1313+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h 
    14 @@ -402,6 +402,8 @@ 
     14@@ -401,6 +401,8 @@ 
    1515 #define GPIO_MODE_6358_EXTRA_SPI_SS    (1 << 7) 
    1616 #define GPIO_MODE_6358_SERIAL_LED      (1 << 10) 
  • trunk/target/linux/brcm63xx/patches-2.6.39/240-spi.patch

    r27019 r27232  
    201201--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h 
    202202+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h 
    203 @@ -771,4 +771,116 @@ 
     203@@ -805,4 +805,116 @@ 
    204204 #define DMIPSPLLCFG_N2_SHIFT           29 
    205205 #define DMIPSPLLCFG_N2_MASK            (0x7 << DMIPSPLLCFG_N2_SHIFT) 
     
    991991  
    992992 #define PFX    "board_bcm963xx: " 
    993 @@ -931,6 +932,9 @@ int __init board_register_devices(void) 
     993@@ -925,6 +926,9 @@ int __init board_register_devices(void) 
    994994        if (board.num_spis) 
    995995                spi_register_board_info(board.spis, board.num_spis); 
     
    999999+ 
    10001000        /* read base address of boot chip select (0) */ 
    1001         if (BCMCPU_IS_6345()) 
    1002                 val = 0x1fc00000; 
     1001        val = bcm_mpi_readl(MPI_CSBASE_REG(0)); 
     1002        val &= MPI_CSBASE_BASE_MASK; 
  • trunk/target/linux/brcm63xx/patches-2.6.39/250-boardid_fixup.patch

    r27019 r27232  
    4545  * early init callback, read nvram data from flash and checksum it 
    4646  */ 
    47 @@ -771,6 +798,11 @@ void __init board_prom_init(void) 
     47@@ -765,6 +792,11 @@ void __init board_prom_init(void) 
    4848                return; 
    4949        } 
  • trunk/target/linux/brcm63xx/patches-2.6.39/441-board-NB4.patch

    r27019 r27232  
    558558  * Register a sane SPROMv2 to make the on-board 
    559559  * bcm4318 WLAN work 
    560 @@ -959,6 +1485,9 @@ void __init board_prom_init(void) 
     560@@ -953,6 +1479,9 @@ void __init board_prom_init(void) 
    561561                boardid_fixup(boot_addr); 
    562562        } 
  • trunk/target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch

    r27019 r27232  
    7373  
    7474 #ifdef CONFIG_BCM63XX_CPU_6358 
    75 @@ -2057,6 +2115,22 @@ void __init board_prom_init(void) 
    76                 val &= MPI_CSBASE_BASE_MASK; 
    77         } 
     75@@ -2051,6 +2109,22 @@ void __init board_prom_init(void) 
     76        val = bcm_mpi_readl(MPI_CSBASE_REG(0)); 
     77        val &= MPI_CSBASE_BASE_MASK; 
    7878        boot_addr = (u8 *)KSEG1ADDR(val); 
    7979+       printk(KERN_INFO PFX "Boot address 0x%08x\n",(unsigned int)boot_addr); 
     
    9696        /* dump cfe version */ 
    9797        cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET; 
    98 @@ -2264,6 +2338,14 @@ int __init board_register_devices(void) 
    99                 val = bcm_mpi_readl(MPI_CSBASE_REG(0)); 
    100                 val &= MPI_CSBASE_BASE_MASK; 
    101         } 
    102 + 
    103 +       /* BT Voyager 2500V has 8 Meg flash in two 4 Meg banks */ 
    104 +       /* Loading from CFE always uses Bank 0 */ 
     98@@ -2255,6 +2329,13 @@ int __init board_register_devices(void) 
     99        val = bcm_mpi_readl(MPI_CSBASE_REG(0)); 
     100        val &= MPI_CSBASE_BASE_MASK; 
     101  
     102+       /* BT Voyager 2500V has 8 Meg flash in two 4 Meg banks 
     103+        * Loading from CFE always uses Bank 0 */ 
    105104+       if (!strcmp(board.name, "V2500V_BB")) { 
    106105+               printk(KERN_INFO PFX "V2500V: Start in Bank 0\n"); 
    107 +               val = val + 0x400000; // Select Bank 0 start address 
    108 +               } 
     106+               val = val + 0x400000; /* Select Bank 0 start address */ 
     107+       } 
    109108+ 
    110109        mtd_resources[0].start = val; 
  • trunk/target/linux/brcm63xx/patches-2.6.39/500-ssb-add-callback-for-sprom.patch

    r27019 r27232  
    11--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    22+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    3 @@ -2128,6 +2128,17 @@ static struct ssb_sprom bcm63xx_sprom = 
     3@@ -2136,6 +2136,17 @@ static struct ssb_sprom bcm63xx_sprom = 
    44        .boardflags_lo          = 0x2848, 
    55        .boardflags_hi          = 0x0000, 
     
    1919  
    2020 /* 
    21 @@ -2328,8 +2339,9 @@ void __init board_prom_init(void) 
     21@@ -2330,8 +2341,9 @@ void __init board_prom_init(void) 
    2222        if (!board_get_mac_address(bcm63xx_sprom.il0mac)) { 
    2323                memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN); 
  • trunk/target/linux/brcm63xx/patches-2.6.39/977-ssb_export_fallback_sprom.patch

    r27019 r27232  
    11--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    22+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    3 @@ -2108,7 +2108,7 @@ static void __init nb4_nvram_fixup(void) 
     3@@ -2116,7 +2116,7 @@ static void __init nb4_nvram_fixup(void) 
    44  * bcm4318 WLAN work 
    55  */ 
     
    1010        .board_rev              = 0x17, 
    1111        .country_code           = 0x0, 
    12 @@ -2128,6 +2128,7 @@ static struct ssb_sprom bcm63xx_sprom = 
     12@@ -2136,6 +2136,7 @@ static struct ssb_sprom bcm63xx_sprom = 
    1313        .boardflags_lo          = 0x2848, 
    1414        .boardflags_hi          = 0x0000, 
Note: See TracChangeset for help on using the changeset viewer.