Changeset 26846


Ignore:
Timestamp:
2011-05-07T14:49:17+02:00 (7 years ago)
Author:
hauke
Message:

brcm47xx: update patches

Location:
trunk/target/linux/brcm47xx
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/brcm47xx/patches-2.6.37/031-ssb-add-callback-for-sprom.patch

    r26829 r26846  
    4141        u16 *buf; 
    4242  
    43 @@ -707,10 +706,14 @@ static int ssb_pci_sprom_get(struct ssb_ 
     43@@ -707,10 +706,17 @@ static int ssb_pci_sprom_get(struct ssb_ 
    4444                if (err) { 
    4545                        /* All CRC attempts failed. 
     
    5757+                                          err); 
    5858+                       } else { 
     59+                               ssb_dprintk(KERN_DEBUG PFX "Using SPROM" 
     60+                                           " revision %d provided by" 
     61+                                           " platform.\n", sprom->revision); 
    5962                                err = 0; 
    6063                                goto out_free; 
  • trunk/target/linux/brcm47xx/patches-2.6.37/033-bcm47xx-register-fallback-callback.patch

    r26829 r26846  
    11--- a/arch/mips/bcm47xx/nvram.c 
    22+++ b/arch/mips/bcm47xx/nvram.c 
    3 @@ -23,7 +23,7 @@ 
     3@@ -3,6 +3,7 @@ 
     4  * 
     5  * Copyright (C) 2005 Broadcom Corporation 
     6  * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org> 
     7+ * Copyright (C) 2010-2011 Hauke Mehrtens <hauke@hauke-m.de> 
     8  * 
     9  * This program is free software; you can redistribute  it and/or modify it 
     10  * under  the terms of  the GNU General  Public License as published by the 
     11@@ -23,7 +24,7 @@ 
    412 static char nvram_buf[NVRAM_SPACE]; 
    513  
     
    1220--- a/arch/mips/bcm47xx/setup.c 
    1321+++ b/arch/mips/bcm47xx/setup.c 
    14 @@ -156,6 +156,22 @@ static void bcm47xx_fill_sprom(struct ss 
     22@@ -3,6 +3,7 @@ 
     23  *  Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org> 
     24  *  Copyright (C) 2006 Michael Buesch <mb@bu3sch.de> 
     25  *  Copyright (C) 2010 Waldemar Brodkorb <wbx@openadk.org> 
     26+ *  Copyright (C) 2010-2011 Hauke Mehrtens <hauke@hauke-m.de> 
     27  * 
     28  *  This program is free software; you can redistribute  it and/or modify it 
     29  *  under  the terms of  the GNU General  Public License as published by the 
     30@@ -156,6 +157,22 @@ static void bcm47xx_fill_sprom(struct ss 
    1531        } 
    1632 } 
     
    2137+ 
    2238+       if (bus->bustype == SSB_BUSTYPE_PCI) { 
    23 +               snprintf(prefix, sizeof(prefix), "pci/%x/%x/", 
     39+               snprintf(prefix, sizeof(prefix), "pci/%u/%u/", 
    2440+                        bus->host_pci->bus->number + 1, 
    2541+                        PCI_SLOT(bus->host_pci->devfn)); 
     
    3551                                   struct ssb_init_invariants *iv) 
    3652 { 
    37 @@ -212,6 +228,11 @@ void __init plat_mem_setup(void) 
     53@@ -212,6 +229,11 @@ void __init plat_mem_setup(void) 
    3854        char buf[100]; 
    3955        struct ssb_mipscore *mcore; 
  • trunk/target/linux/brcm47xx/patches-2.6.37/034-bcm47xx-extend-and-fix-fill-sprom.patch

    r26828 r26846  
    11--- a/arch/mips/bcm47xx/setup.c 
    22+++ b/arch/mips/bcm47xx/setup.c 
    3 @@ -62,6 +62,11 @@ static void bcm47xx_machine_halt(void) 
     3@@ -63,6 +63,11 @@ static void bcm47xx_machine_halt(void) 
    44        if (nvram_getprefix(prefix, name, buf, sizeof(buf)) >= 0)\ 
    55                sprom->_outvar = simple_strtoul(buf, NULL, 0); 
     
    1313                                  char *buf, int len) 
    1414 { 
    15 @@ -75,6 +80,27 @@ static inline int nvram_getprefix(const 
     15@@ -76,6 +81,27 @@ static inline int nvram_getprefix(const 
    1616        return nvram_getenv(name, buf, len); 
    1717 } 
     
    4141 { 
    4242        char buf[100]; 
    43 @@ -84,7 +110,8 @@ static void bcm47xx_fill_sprom(struct ss 
     43@@ -85,7 +111,8 @@ static void bcm47xx_fill_sprom(struct ss 
    4444  
    4545        sprom->revision = 1; /* Fallback: Old hardware does not define this. */ 
     
    5151        if (nvram_getprefix(prefix, "et0macaddr", buf, sizeof(buf)) >= 0) 
    5252                nvram_parse_macaddr(buf, sprom->et0mac); 
    53 @@ -110,20 +137,36 @@ static void bcm47xx_fill_sprom(struct ss 
     53@@ -111,20 +138,36 @@ static void bcm47xx_fill_sprom(struct ss 
    5454        READ_FROM_NVRAM(pa1hib0, "pa1hib0", buf); 
    5555        READ_FROM_NVRAM(pa1hib2, "pa1hib1", buf); 
     
    9898        READ_FROM_NVRAM(rxpo5g, "rxpo5g", buf); 
    9999        READ_FROM_NVRAM(rssisav2g, "rssisav2g", buf); 
    100 @@ -135,10 +178,18 @@ static void bcm47xx_fill_sprom(struct ss 
     100@@ -136,10 +179,18 @@ static void bcm47xx_fill_sprom(struct ss 
    101101        READ_FROM_NVRAM(rssismf5g, "rssismf5g", buf); 
    102102        READ_FROM_NVRAM(bxa5g, "bxa5g", buf); 
  • trunk/target/linux/brcm47xx/patches-2.6.37/400-arch-bcm47xx.patch

    r26801 r26846  
    11--- a/arch/mips/bcm47xx/nvram.c 
    22+++ b/arch/mips/bcm47xx/nvram.c 
    3 @@ -92,3 +92,30 @@ int nvram_getenv(char *name, char *val, 
     3@@ -93,3 +93,30 @@ int nvram_getenv(char *name, char *val, 
    44        return NVRAM_ERR_ENVNOTFOUND; 
    55 } 
     
    3434--- a/arch/mips/bcm47xx/setup.c 
    3535+++ b/arch/mips/bcm47xx/setup.c 
    36 @@ -311,3 +311,20 @@ void __init plat_mem_setup(void) 
     36@@ -312,3 +312,20 @@ void __init plat_mem_setup(void) 
    3737        _machine_halt = bcm47xx_machine_halt; 
    3838        pm_power_off = bcm47xx_machine_halt; 
  • trunk/target/linux/brcm47xx/patches-2.6.37/820-wgt634u-nvram-fix.patch

    r26801 r26846  
    246246--- a/arch/mips/bcm47xx/nvram.c 
    247247+++ b/arch/mips/bcm47xx/nvram.c 
    248 @@ -21,6 +21,8 @@ 
     248@@ -22,6 +22,8 @@ 
    249249 #include <asm/mach-bcm47xx/bcm47xx.h> 
    250250  
     
    255255 /* Probe for NVRAM header */ 
    256256 static void early_nvram_init(void) 
    257 @@ -33,6 +35,25 @@ static void early_nvram_init(void) 
     257@@ -34,6 +36,25 @@ static void early_nvram_init(void) 
    258258  
    259259        base = mcore->flash_window; 
     
    281281        off = FLASH_MIN; 
    282282        while (off <= lim) { 
    283 @@ -74,6 +95,12 @@ int nvram_getenv(char *name, char *val, 
     283@@ -75,6 +96,12 @@ int nvram_getenv(char *name, char *val, 
    284284        if (!nvram_buf[0]) 
    285285                early_nvram_init(); 
     
    294294        var = &nvram_buf[sizeof(struct nvram_header)]; 
    295295        end = nvram_buf + sizeof(nvram_buf) - 2; 
    296 @@ -103,6 +130,9 @@ char *nvram_get(const char *name) 
     296@@ -104,6 +131,9 @@ char *nvram_get(const char *name) 
    297297        if (!nvram_buf[0]) 
    298298                early_nvram_init(); 
  • trunk/target/linux/brcm47xx/patches-2.6.37/980-wnr834b_no_cardbus_invariant.patch

    r26801 r26846  
    11--- a/arch/mips/bcm47xx/setup.c 
    22+++ b/arch/mips/bcm47xx/setup.c 
    3 @@ -245,6 +245,10 @@ static int bcm47xx_get_invariants(struct 
     3@@ -246,6 +246,10 @@ static int bcm47xx_get_invariants(struct 
    44        if (nvram_getenv("cardbus", buf, sizeof(buf)) >= 0) 
    55                iv->has_cardbus_slot = !!simple_strtoul(buf, NULL, 10); 
  • trunk/target/linux/brcm47xx/patches-2.6.37/999-wl_exports.patch

    r23911 r26846  
    11--- a/arch/mips/bcm47xx/nvram.c 
    22+++ b/arch/mips/bcm47xx/nvram.c 
    3 @@ -20,7 +20,8 @@ 
     3@@ -21,7 +21,8 @@ 
    44 #include <asm/mach-bcm47xx/nvram.h> 
    55 #include <asm/mach-bcm47xx/bcm47xx.h> 
  • trunk/target/linux/brcm47xx/patches-2.6.38/031-ssb-add-callback-for-sprom.patch

    r26829 r26846  
    4141        u16 *buf; 
    4242  
    43 @@ -707,10 +706,14 @@ static int ssb_pci_sprom_get(struct ssb_ 
     43@@ -707,10 +706,17 @@ static int ssb_pci_sprom_get(struct ssb_ 
    4444                if (err) { 
    4545                        /* All CRC attempts failed. 
     
    5757+                                          err); 
    5858+                       } else { 
     59+                               ssb_dprintk(KERN_DEBUG PFX "Using SPROM" 
     60+                                           " revision %d provided by" 
     61+                                           " platform.\n", sprom->revision); 
    5962                                err = 0; 
    6063                                goto out_free; 
  • trunk/target/linux/brcm47xx/patches-2.6.38/033-bcm47xx-register-fallback-callback.patch

    r26829 r26846  
    11--- a/arch/mips/bcm47xx/nvram.c 
    22+++ b/arch/mips/bcm47xx/nvram.c 
    3 @@ -23,7 +23,7 @@ 
     3@@ -3,6 +3,7 @@ 
     4  * 
     5  * Copyright (C) 2005 Broadcom Corporation 
     6  * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org> 
     7+ * Copyright (C) 2010-2011 Hauke Mehrtens <hauke@hauke-m.de> 
     8  * 
     9  * This program is free software; you can redistribute  it and/or modify it 
     10  * under  the terms of  the GNU General  Public License as published by the 
     11@@ -23,7 +24,7 @@ 
    412 static char nvram_buf[NVRAM_SPACE]; 
    513  
     
    1220--- a/arch/mips/bcm47xx/setup.c 
    1321+++ b/arch/mips/bcm47xx/setup.c 
    14 @@ -156,6 +156,22 @@ static void bcm47xx_fill_sprom(struct ss 
     22@@ -3,6 +3,7 @@ 
     23  *  Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org> 
     24  *  Copyright (C) 2006 Michael Buesch <mb@bu3sch.de> 
     25  *  Copyright (C) 2010 Waldemar Brodkorb <wbx@openadk.org> 
     26+ *  Copyright (C) 2010-2011 Hauke Mehrtens <hauke@hauke-m.de> 
     27  * 
     28  *  This program is free software; you can redistribute  it and/or modify it 
     29  *  under  the terms of  the GNU General  Public License as published by the 
     30@@ -156,6 +157,22 @@ static void bcm47xx_fill_sprom(struct ss 
    1531        } 
    1632 } 
     
    2137+ 
    2238+       if (bus->bustype == SSB_BUSTYPE_PCI) { 
    23 +               snprintf(prefix, sizeof(prefix), "pci/%x/%x/", 
     39+               snprintf(prefix, sizeof(prefix), "pci/%u/%u/", 
    2440+                        bus->host_pci->bus->number + 1, 
    2541+                        PCI_SLOT(bus->host_pci->devfn)); 
     
    3551                                   struct ssb_init_invariants *iv) 
    3652 { 
    37 @@ -212,6 +228,11 @@ void __init plat_mem_setup(void) 
     53@@ -212,6 +229,11 @@ void __init plat_mem_setup(void) 
    3854        char buf[100]; 
    3955        struct ssb_mipscore *mcore; 
  • trunk/target/linux/brcm47xx/patches-2.6.38/034-bcm47xx-extend-and-fix-fill-sprom.patch

    r26828 r26846  
    11--- a/arch/mips/bcm47xx/setup.c 
    22+++ b/arch/mips/bcm47xx/setup.c 
    3 @@ -62,6 +62,11 @@ static void bcm47xx_machine_halt(void) 
     3@@ -63,6 +63,11 @@ static void bcm47xx_machine_halt(void) 
    44        if (nvram_getprefix(prefix, name, buf, sizeof(buf)) >= 0)\ 
    55                sprom->_outvar = simple_strtoul(buf, NULL, 0); 
     
    1313                                  char *buf, int len) 
    1414 { 
    15 @@ -75,6 +80,27 @@ static inline int nvram_getprefix(const 
     15@@ -76,6 +81,27 @@ static inline int nvram_getprefix(const 
    1616        return nvram_getenv(name, buf, len); 
    1717 } 
     
    4141 { 
    4242        char buf[100]; 
    43 @@ -84,7 +110,8 @@ static void bcm47xx_fill_sprom(struct ss 
     43@@ -85,7 +111,8 @@ static void bcm47xx_fill_sprom(struct ss 
    4444  
    4545        sprom->revision = 1; /* Fallback: Old hardware does not define this. */ 
     
    5151        if (nvram_getprefix(prefix, "et0macaddr", buf, sizeof(buf)) >= 0) 
    5252                nvram_parse_macaddr(buf, sprom->et0mac); 
    53 @@ -110,20 +137,36 @@ static void bcm47xx_fill_sprom(struct ss 
     53@@ -111,20 +138,36 @@ static void bcm47xx_fill_sprom(struct ss 
    5454        READ_FROM_NVRAM(pa1hib0, "pa1hib0", buf); 
    5555        READ_FROM_NVRAM(pa1hib2, "pa1hib1", buf); 
     
    9898        READ_FROM_NVRAM(rxpo5g, "rxpo5g", buf); 
    9999        READ_FROM_NVRAM(rssisav2g, "rssisav2g", buf); 
    100 @@ -135,10 +178,18 @@ static void bcm47xx_fill_sprom(struct ss 
     100@@ -136,10 +179,18 @@ static void bcm47xx_fill_sprom(struct ss 
    101101        READ_FROM_NVRAM(rssismf5g, "rssismf5g", buf); 
    102102        READ_FROM_NVRAM(bxa5g, "bxa5g", buf); 
  • trunk/target/linux/brcm47xx/patches-2.6.38/400-arch-bcm47xx.patch

    r26801 r26846  
    11--- a/arch/mips/bcm47xx/nvram.c 
    22+++ b/arch/mips/bcm47xx/nvram.c 
    3 @@ -92,3 +92,30 @@ int nvram_getenv(char *name, char *val, 
     3@@ -93,3 +93,30 @@ int nvram_getenv(char *name, char *val, 
    44        return NVRAM_ERR_ENVNOTFOUND; 
    55 } 
     
    3434--- a/arch/mips/bcm47xx/setup.c 
    3535+++ b/arch/mips/bcm47xx/setup.c 
    36 @@ -311,3 +311,20 @@ void __init plat_mem_setup(void) 
     36@@ -312,3 +312,20 @@ void __init plat_mem_setup(void) 
    3737        _machine_halt = bcm47xx_machine_halt; 
    3838        pm_power_off = bcm47xx_machine_halt; 
  • trunk/target/linux/brcm47xx/patches-2.6.38/820-wgt634u-nvram-fix.patch

    r26801 r26846  
    246246--- a/arch/mips/bcm47xx/nvram.c 
    247247+++ b/arch/mips/bcm47xx/nvram.c 
    248 @@ -21,6 +21,8 @@ 
     248@@ -22,6 +22,8 @@ 
    249249 #include <asm/mach-bcm47xx/bcm47xx.h> 
    250250  
     
    255255 /* Probe for NVRAM header */ 
    256256 static void early_nvram_init(void) 
    257 @@ -33,6 +35,25 @@ static void early_nvram_init(void) 
     257@@ -34,6 +36,25 @@ static void early_nvram_init(void) 
    258258  
    259259        base = mcore->flash_window; 
     
    281281        off = FLASH_MIN; 
    282282        while (off <= lim) { 
    283 @@ -74,6 +95,12 @@ int nvram_getenv(char *name, char *val, 
     283@@ -75,6 +96,12 @@ int nvram_getenv(char *name, char *val, 
    284284        if (!nvram_buf[0]) 
    285285                early_nvram_init(); 
     
    294294        var = &nvram_buf[sizeof(struct nvram_header)]; 
    295295        end = nvram_buf + sizeof(nvram_buf) - 2; 
    296 @@ -103,6 +130,9 @@ char *nvram_get(const char *name) 
     296@@ -104,6 +131,9 @@ char *nvram_get(const char *name) 
    297297        if (!nvram_buf[0]) 
    298298                early_nvram_init(); 
  • trunk/target/linux/brcm47xx/patches-2.6.38/980-wnr834b_no_cardbus_invariant.patch

    r26801 r26846  
    11--- a/arch/mips/bcm47xx/setup.c 
    22+++ b/arch/mips/bcm47xx/setup.c 
    3 @@ -245,6 +245,10 @@ static int bcm47xx_get_invariants(struct 
     3@@ -246,6 +246,10 @@ static int bcm47xx_get_invariants(struct 
    44        if (nvram_getenv("cardbus", buf, sizeof(buf)) >= 0) 
    55                iv->has_cardbus_slot = !!simple_strtoul(buf, NULL, 10); 
  • trunk/target/linux/brcm47xx/patches-2.6.38/999-wl_exports.patch

    r23911 r26846  
    11--- a/arch/mips/bcm47xx/nvram.c 
    22+++ b/arch/mips/bcm47xx/nvram.c 
    3 @@ -20,7 +20,8 @@ 
     3@@ -21,7 +21,8 @@ 
    44 #include <asm/mach-bcm47xx/nvram.h> 
    55 #include <asm/mach-bcm47xx/bcm47xx.h> 
Note: See TracChangeset for help on using the changeset viewer.