Changeset 29726


Ignore:
Timestamp:
2012-01-13T15:38:28+01:00 (6 years ago)
Author:
jogo
Message:

kernel: update linux 3.1 to 3.1.9

Location:
trunk
Files:
24 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/kernel-version.mk

    r29725 r29726  
    3333  LINUX_KERNEL_MD5SUM:=fcdd6a945445336e4cd28b2d195f1fea 
    3434endif 
    35 ifeq ($(LINUX_VERSION),3.1.4) 
    36   LINUX_KERNEL_MD5SUM:=52643e5a013d450ad69627c3cac490cb 
     35ifeq ($(LINUX_VERSION),3.1.9) 
     36  LINUX_KERNEL_MD5SUM:=4e387a49cde20805955c905bc8c311e0 
    3737endif 
    3838 
  • trunk/target/linux/brcm63xx/patches-3.1/010-add_bcm63xx_ohci_controller.patch

    r27941 r29726  
    178178--- a/drivers/usb/host/ohci-hcd.c 
    179179+++ b/drivers/usb/host/ohci-hcd.c 
    180 @@ -1058,6 +1058,11 @@ MODULE_LICENSE ("GPL"); 
     180@@ -1055,6 +1055,11 @@ MODULE_LICENSE ("GPL"); 
    181181 #define PLATFORM_DRIVER                ohci_hcd_da8xx_driver 
    182182 #endif 
     
    192192--- a/drivers/usb/host/ohci.h 
    193193+++ b/drivers/usb/host/ohci.h 
    194 @@ -646,7 +646,7 @@ static inline u32 hc32_to_cpup (const st 
     194@@ -645,7 +645,7 @@ static inline u32 hc32_to_cpup (const st 
    195195  * some big-endian SOC implementations.  Same thing happens with PSW access. 
    196196  */ 
  • trunk/target/linux/brcm63xx/patches-3.1/448-board-MAGIC.patch

    r27941 r29726  
    11--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    22+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    3 @@ -751,6 +751,76 @@ static struct board_info __initdata boar 
     3@@ -746,6 +746,76 @@ static struct board_info __initdata boar 
    44        }, 
    55 }; 
     
    7878  
    7979 /* 
    80 @@ -1661,6 +1731,7 @@ static const struct board_info __initdat 
     80@@ -1656,6 +1726,7 @@ static const struct board_info __initdat 
    8181        &board_rta1025w_16, 
    8282        &board_96348_D4PW, 
  • trunk/target/linux/brcm63xx/patches-3.1/449-board_hw553.patch

    r27941 r29726  
    11--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    22+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    3 @@ -1704,6 +1704,81 @@ static struct board_info __initdata boar 
     3@@ -1699,6 +1699,81 @@ static struct board_info __initdata boar 
    44        .spis = nb4_spi_devices, 
    55        .num_spis = ARRAY_SIZE(nb4_spi_devices), 
     
    8383  
    8484 /* 
    85 @@ -1746,6 +1821,7 @@ static const struct board_info __initdat 
     85@@ -1741,6 +1816,7 @@ static const struct board_info __initdat 
    8686        &board_nb4_ser_r2, 
    8787        &board_nb4_fxc_r1, 
  • trunk/target/linux/brcm63xx/patches-3.1/450-board_rta1320_16m.patch

    r27941 r29726  
    4545  
    4646 /* 
    47 @@ -1789,6 +1826,7 @@ static const struct board_info __initdat 
     47@@ -1784,6 +1821,7 @@ static const struct board_info __initdat 
    4848        &board_96338gw, 
    4949        &board_96338w, 
  • trunk/target/linux/brcm63xx/patches-3.1/451-board_spw303v.patch

    r27941 r29726  
    11--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    22+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    3 @@ -1816,6 +1816,72 @@ static struct board_info __initdata boar 
     3@@ -1811,6 +1811,72 @@ static struct board_info __initdata boar 
    44                }, 
    55        }, 
     
    7474  
    7575 /* 
    76 @@ -1860,6 +1926,7 @@ static const struct board_info __initdat 
     76@@ -1855,6 +1921,7 @@ static const struct board_info __initdat 
    7777        &board_nb4_fxc_r1, 
    7878        &board_nb4_fxc_r2, 
  • trunk/target/linux/brcm63xx/patches-3.1/452-board_V2500V.patch

    r27941 r29726  
    11--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    22+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    3 @@ -858,6 +858,63 @@ static struct board_info __initdata boar 
     3@@ -853,6 +853,63 @@ static struct board_info __initdata boar 
    44        }, 
    55 }; 
     
    6565  
    6666 /* 
    67 @@ -1911,6 +1968,7 @@ static const struct board_info __initdat 
     67@@ -1906,6 +1963,7 @@ static const struct board_info __initdat 
    6868        &board_96348_D4PW, 
    6969        &board_spw500v, 
     
    7373  
    7474 #ifdef CONFIG_BCM63XX_CPU_6358 
    75 @@ -2064,6 +2122,22 @@ void __init board_prom_init(void) 
     75@@ -2059,6 +2117,22 @@ void __init board_prom_init(void) 
    7676        val = bcm_mpi_readl(MPI_CSBASE_REG(0)); 
    7777        val &= MPI_CSBASE_BASE_MASK; 
     
    9696        /* dump cfe version */ 
    9797        cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET; 
    98 @@ -2265,6 +2339,13 @@ int __init board_register_devices(void) 
     98@@ -2260,6 +2334,13 @@ int __init board_register_devices(void) 
    9999        val = bcm_mpi_readl(MPI_CSBASE_REG(0)); 
    100100        val &= MPI_CSBASE_BASE_MASK; 
  • trunk/target/linux/brcm63xx/patches-3.1/453-board_BTV2110.patch

    r27941 r29726  
    6464        .name                           = "96348GW", 
    6565        .expected_cpu_id                = 0x6348, 
    66 @@ -1969,6 +2025,7 @@ static const struct board_info __initdat 
     66@@ -1964,6 +2020,7 @@ static const struct board_info __initdat 
    6767        &board_spw500v, 
    6868        &board_96348sv, 
  • trunk/target/linux/brcm63xx/patches-3.1/455-board_ct536_ct5621.patch

    r27941 r29726  
    5151        .name                           = "96348GW", 
    5252        .expected_cpu_id                = 0x6348, 
    53 @@ -2026,6 +2069,7 @@ static const struct board_info __initdat 
     53@@ -2021,6 +2064,7 @@ static const struct board_info __initdat 
    5454        &board_96348sv, 
    5555        &board_V2500V_BB, 
  • trunk/target/linux/brcm63xx/patches-3.1/456-board_DWV-S0_fixes.patch

    r29044 r29726  
    11--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    22+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    3 @@ -1332,6 +1332,8 @@ static struct board_info __initdata boar 
     3@@ -1327,6 +1327,8 @@ static struct board_info __initdata boar 
    44        .name                           = "DWV-S0", 
    55        .expected_cpu_id                = 0x6358, 
     
    1010        .has_enet1                      = 1, 
    1111        .has_pci                        = 1, 
    12 @@ -1347,6 +1349,7 @@ static struct board_info __initdata boar 
     12@@ -1342,6 +1344,7 @@ static struct board_info __initdata boar 
    1313        }, 
    1414  
  • trunk/target/linux/brcm63xx/patches-3.1/977-ssb_export_fallback_sprom.patch

    r29044 r29726  
    11--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    22+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    3 @@ -2113,7 +2113,7 @@ static void __init nb4_nvram_fixup(void) 
     3@@ -2108,7 +2108,7 @@ static void __init nb4_nvram_fixup(void) 
    44  * bcm4318 WLAN work 
    55  */ 
     
    1010        .board_rev              = 0x17, 
    1111        .country_code           = 0x0, 
    12 @@ -2133,6 +2133,7 @@ static struct ssb_sprom bcm63xx_sprom = 
     12@@ -2128,6 +2128,7 @@ static struct ssb_sprom bcm63xx_sprom = 
    1313        .boardflags_lo          = 0x2848, 
    1414        .boardflags_hi          = 0x0000, 
  • trunk/target/linux/generic/patches-3.1/020-ssb_update.patch

    r29574 r29726  
    99  
    1010 #include "ssb_private.h" 
    11 --- a/drivers/ssb/driver_pcicore.c 
    12 +++ b/drivers/ssb/driver_pcicore.c 
    13 @@ -516,10 +516,14 @@ static void ssb_pcicore_pcie_setup_worka 
    14   
    15  static void __devinit ssb_pcicore_init_clientmode(struct ssb_pcicore *pc) 
    16  { 
    17 -       ssb_pcicore_fix_sprom_core_index(pc); 
    18 +       struct ssb_device *pdev = pc->dev; 
    19 +       struct ssb_bus *bus = pdev->bus; 
    20 + 
    21 +       if (bus->bustype == SSB_BUSTYPE_PCI) 
    22 +               ssb_pcicore_fix_sprom_core_index(pc); 
    23   
    24         /* Disable PCI interrupts. */ 
    25 -       ssb_write32(pc->dev, SSB_INTVEC, 0); 
    26 +       ssb_write32(pdev, SSB_INTVEC, 0); 
    27   
    28         /* Additional PCIe always once-executed workarounds */ 
    29         if (pc->dev->id.coreid == SSB_DEV_PCIE) { 
    3011--- a/drivers/ssb/main.c 
    3112+++ b/drivers/ssb/main.c 
  • trunk/target/linux/generic/patches-3.1/100-overlayfs_v11.patch

    r29007 r29726  
    255255--- a/fs/namespace.c 
    256256+++ b/fs/namespace.c 
    257 @@ -1495,6 +1495,23 @@ void drop_collected_mounts(struct vfsmou 
     257@@ -1492,6 +1492,23 @@ void drop_collected_mounts(struct vfsmou 
    258258        release_mounts(&umount_list); 
    259259 } 
     
    31553155  
    31563156 struct seq_file; 
    3157 @@ -2022,6 +2034,7 @@ extern long do_sys_open(int dfd, const c 
     3157@@ -2023,6 +2035,7 @@ extern long do_sys_open(int dfd, const c 
    31583158 extern struct file *filp_open(const char *, int, int); 
    31593159 extern struct file *file_open_root(struct dentry *, struct vfsmount *, 
  • trunk/target/linux/generic/patches-3.1/720-phy_adm6996.patch

    r27940 r29726  
    11--- a/drivers/net/phy/Kconfig 
    22+++ b/drivers/net/phy/Kconfig 
    3 @@ -98,6 +98,13 @@ config MICREL_PHY 
     3@@ -102,6 +102,13 @@ config MICREL_PHY 
    44        ---help--- 
    55          Supports the KSZ9021, VSC8201, KS8001 PHYs. 
  • trunk/target/linux/generic/patches-3.1/722-phy_mvswitch.patch

    r27940 r29726  
    11--- a/drivers/net/phy/Kconfig 
    22+++ b/drivers/net/phy/Kconfig 
    3 @@ -105,6 +105,9 @@ config ADM6996_PHY 
     3@@ -109,6 +109,9 @@ config ADM6996_PHY 
    44          Currently supports the ADM6996FC and ADM6996M switches. 
    55          Support for FC is very limited. 
  • trunk/target/linux/generic/patches-3.1/723-phy_ip175c.patch

    r27940 r29726  
    11--- a/drivers/net/phy/Kconfig 
    22+++ b/drivers/net/phy/Kconfig 
    3 @@ -108,6 +108,10 @@ config ADM6996_PHY 
     3@@ -112,6 +112,10 @@ config ADM6996_PHY 
    44 config MVSWITCH_PHY 
    55        tristate "Driver for Marvell 88E6060 switches" 
  • trunk/target/linux/generic/patches-3.1/724-phy_ar8216.patch

    r27940 r29726  
    11--- a/drivers/net/phy/Kconfig 
    22+++ b/drivers/net/phy/Kconfig 
    3 @@ -112,6 +112,10 @@ config IP17XX_PHY 
     3@@ -116,6 +116,10 @@ config IP17XX_PHY 
    44        tristate "Driver for IC+ IP17xx switches" 
    55        select SWCONFIG 
  • trunk/target/linux/generic/patches-3.1/725-phy_rtl8306.patch

    r27940 r29726  
    11--- a/drivers/net/phy/Kconfig 
    22+++ b/drivers/net/phy/Kconfig 
    3 @@ -116,6 +116,10 @@ config AR8216_PHY 
     3@@ -120,6 +120,10 @@ config AR8216_PHY 
    44        tristate "Driver for Atheros AR8216 switches" 
    55        select SWCONFIG 
  • trunk/target/linux/generic/patches-3.1/726-phy_rtl8366.patch

    r27940 r29726  
    11--- a/drivers/net/phy/Kconfig 
    22+++ b/drivers/net/phy/Kconfig 
    3 @@ -158,4 +158,29 @@ config MDIO_OCTEON 
     3@@ -162,4 +162,29 @@ config MDIO_OCTEON 
    44  
    55          If in doubt, say Y. 
  • trunk/target/linux/generic/patches-3.1/811-pci_disable_usb_common_quirks.patch

    r29470 r29726  
    22--- a/drivers/usb/host/pci-quirks.c 
    33+++ b/drivers/usb/host/pci-quirks.c 
    4 @@ -429,6 +429,8 @@ reset_needed: 
     4@@ -430,6 +430,8 @@ reset_needed: 
    55 } 
    66 EXPORT_SYMBOL_GPL(uhci_check_and_reset_hc); 
     
    1111 { 
    1212        u16 cmd; 
    13 @@ -882,3 +884,5 @@ static void __devinit quirk_usb_early_ha 
     13@@ -876,3 +878,5 @@ static void __devinit quirk_usb_early_ha 
    1414                quirk_usb_handoff_xhci(pdev); 
    1515 } 
  • trunk/target/linux/lantiq/Makefile

    r29470 r29726  
    1313DEFAULT_SUBTARGET:=danube 
    1414 
    15 LINUX_VERSION:=3.1.4 
     15LINUX_VERSION:=3.1.9 
    1616 
    1717CFLAGS=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves 
  • trunk/target/linux/omap24xx/Makefile

    r29470 r29726  
    1313FEATURES:=targz squashfs jffs2 usb usbgadget display gpio audio 
    1414 
    15 LINUX_VERSION:=3.1.4 
     15LINUX_VERSION:=3.1.9 
    1616 
    1717define Target/Description 
  • trunk/target/linux/omap24xx/patches-3.1/210-omap2-kexec-rewrite.patch

    r29470 r29726  
    11--- a/arch/arm/Kconfig 
    22+++ b/arch/arm/Kconfig 
    3 @@ -1876,7 +1876,7 @@ config XIP_PHYS_ADDR 
     3@@ -1888,7 +1888,7 @@ config XIP_PHYS_ADDR 
    44  
    55 config KEXEC 
     
    202202  
    203203 static void do_nothing(void *unused) 
    204 @@ -250,7 +274,15 @@ void machine_power_off(void) 
     204@@ -253,7 +277,15 @@ void machine_power_off(void) 
    205205 void machine_restart(char *cmd) 
    206206 { 
     
    220220--- a/arch/arm/kernel/setup.c 
    221221+++ b/arch/arm/kernel/setup.c 
    222 @@ -890,8 +890,8 @@ void __init setup_arch(char **cmdline_p) 
    223         machine_desc = mdesc; 
    224         machine_name = mdesc->name; 
    225   
     222@@ -896,8 +896,8 @@ void __init setup_arch(char **cmdline_p) 
     223                arm_dma_zone_size = mdesc->dma_zone_size; 
     224        } 
     225 #endif 
    226226-       if (mdesc->soft_reboot) 
    227227-               reboot_setup("s"); 
     
    231231        init_mm.start_code = (unsigned long) _text; 
    232232        init_mm.end_code   = (unsigned long) _etext; 
    233 @@ -910,6 +910,9 @@ void __init setup_arch(char **cmdline_p) 
     233@@ -916,6 +916,9 @@ void __init setup_arch(char **cmdline_p) 
    234234        paging_init(mdesc); 
    235235        request_standard_resources(mdesc); 
  • trunk/target/linux/omap24xx/patches-3.1/850-musb-tusb-modular-fixes.patch

    r29007 r29726  
    8080                hw_ep->fifo_sync = musb->sync + 0x400 + MUSB_FIFO_OFFSET(i); 
    8181                hw_ep->fifo_sync_va = 
    82 @@ -2376,8 +2376,13 @@ static struct platform_driver musb_drive 
     82@@ -2368,8 +2368,13 @@ static struct platform_driver musb_drive 
    8383  
    8484 /*-------------------------------------------------------------------------*/ 
     
    9494                return 0; 
    9595  
    96 @@ -2386,7 +2391,17 @@ static int __init musb_init(void) 
     96@@ -2378,7 +2383,17 @@ static int __init musb_init(void) 
    9797                ", " 
    9898                "otg (peripheral+host)", 
     
    113113  
    114114 /* make us init after usbcore and i2c (transceivers, regulators, etc) 
    115 @@ -2397,5 +2412,6 @@ fs_initcall(musb_init); 
     115@@ -2389,5 +2404,6 @@ fs_initcall(musb_init); 
    116116 static void __exit musb_cleanup(void) 
    117117 { 
Note: See TracChangeset for help on using the changeset viewer.