Changeset 30481


Ignore:
Timestamp:
2012-02-12T17:45:27+01:00 (6 years ago)
Author:
hauke
Message:

brcm47xx: refresh patches

Location:
trunk/target/linux/brcm47xx/patches-3.2
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/brcm47xx/patches-3.2/0000-pci-backport.patch

    r29843 r30481  
    13591359 }; 
    13601360  
    1361 @@ -261,23 +261,20 @@ static void add_resources(struct pci_roo 
     1361@@ -275,23 +275,20 @@ static void add_resources(struct pci_roo 
    13621362                                 "ignoring host bridge window %pR (conflicts with %s %pR)\n", 
    13631363                                 res, conflict->name, conflict); 
     
    13861386                                &info); 
    13871387        if (!info.res_num) 
    1388 @@ -286,7 +283,7 @@ get_current_resources(struct acpi_device 
     1388@@ -300,7 +297,7 @@ get_current_resources(struct acpi_device 
    13891389        size = sizeof(*info.res) * info.res_num; 
    13901390        info.res = kmalloc(size, GFP_KERNEL); 
     
    13951395        info.name = kasprintf(GFP_KERNEL, "PCI Bus %04x:%02x", domain, busnum); 
    13961396        if (!info.name) 
    1397 @@ -301,8 +298,6 @@ get_current_resources(struct acpi_device 
     1397@@ -315,8 +312,6 @@ get_current_resources(struct acpi_device 
    13981398  
    13991399 name_alloc_fail: 
     
    14041404  
    14051405 struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root) 
    1406 @@ -310,6 +305,7 @@ struct pci_bus * __devinit pci_acpi_scan 
     1406@@ -324,6 +319,7 @@ struct pci_bus * __devinit pci_acpi_scan 
    14071407        struct acpi_device *device = root->device; 
    14081408        int domain = root->segment; 
     
    14121412        struct pci_sysdata *sd; 
    14131413        int node; 
    1414 @@ -364,11 +360,15 @@ struct pci_bus * __devinit pci_acpi_scan 
     1414@@ -378,11 +374,15 @@ struct pci_bus * __devinit pci_acpi_scan 
    14151415                memcpy(bus->sysdata, sd, sizeof(*sd)); 
    14161416                kfree(sd); 
  • trunk/target/linux/brcm47xx/patches-3.2/0036-bcma-add-the-core-unit-number.patch

    r29843 r30481  
    3333                              struct bcma_device_id *match, int core_num, 
    3434                              struct bcma_device *core) 
    35 @@ -407,6 +418,7 @@ int bcma_bus_scan(struct bcma_bus *bus) 
     35@@ -392,6 +403,7 @@ int bcma_bus_scan(struct bcma_bus *bus) 
    3636        bcma_scan_switch_core(bus, erombase); 
    3737  
     
    4141                if (!core) 
    4242                        return -ENOMEM; 
    43 @@ -426,6 +438,8 @@ int bcma_bus_scan(struct bcma_bus *bus) 
     43@@ -411,6 +423,8 @@ int bcma_bus_scan(struct bcma_bus *bus) 
    4444  
    4545                core->core_index = core_num++; 
     
    5959  
    6060        u32 addr; 
    61         u32 addr1; 
     61        u32 wrap; 
  • trunk/target/linux/brcm47xx/patches-3.2/0041-bcma-add-bus-num-counter.patch

    r29843 r30481  
    5050--- a/include/linux/bcma/bcma.h 
    5151+++ b/include/linux/bcma/bcma.h 
    52 @@ -197,6 +197,7 @@ struct bcma_bus { 
     52@@ -196,6 +196,7 @@ struct bcma_bus { 
    5353        struct list_head cores; 
    5454        u8 nr_cores; 
  • trunk/target/linux/brcm47xx/patches-3.2/0042-bcma-add-new-PCI-ID.patch

    r29843 r30481  
    1515--- a/drivers/bcma/host_pci.c 
    1616+++ b/drivers/bcma/host_pci.c 
    17 @@ -275,6 +275,7 @@ static DEFINE_PCI_DEVICE_TABLE(bcma_pci_ 
     17@@ -278,6 +278,7 @@ static DEFINE_PCI_DEVICE_TABLE(bcma_pci_ 
    1818        { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) }, 
    1919        { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4357) }, 
  • trunk/target/linux/brcm47xx/patches-3.2/0045-ssb-fix-cardbus-in-hostmode.patch

    r29923 r30481  
    2020                goto out; 
    2121  
    22         /* Type 0 transaction */ 
     22        if (bus == 0) { 
  • trunk/target/linux/brcm47xx/patches-3.2/0047-bcma-log-the-id-rev-and-pkg-of-the-chip-found.patch

    r30428 r30481  
    1414--- a/drivers/bcma/scan.c 
    1515+++ b/drivers/bcma/scan.c 
    16 @@ -380,6 +380,7 @@ static int bcma_get_next_core(struct bcm 
     16@@ -364,6 +364,7 @@ static int bcma_get_next_core(struct bcm 
    1717 void bcma_init_bus(struct bcma_bus *bus) 
    1818 { 
     
    2222        if (bus->init_done) 
    2323                return; 
    24 @@ -390,9 +391,12 @@ void bcma_init_bus(struct bcma_bus *bus) 
     24@@ -374,9 +375,12 @@ void bcma_init_bus(struct bcma_bus *bus) 
    2525        bcma_scan_switch_core(bus, BCMA_ADDR_BASE); 
    2626  
  • trunk/target/linux/brcm47xx/patches-3.2/220-bcm5354.patch

    r30423 r30481  
    1515 4 files changed, 53 insertions(+), 5 deletions(-) 
    1616 
    17 diff --git a/drivers/ssb/driver_chipcommon_pmu.c b/drivers/ssb/driver_chipcommon_pmu.c 
    18 index e5a2e0e..b58fef7 100644 
    1917--- a/drivers/ssb/driver_chipcommon_pmu.c 
    2018+++ b/drivers/ssb/driver_chipcommon_pmu.c 
     
    2927 #include "ssb_private.h" 
    3028  
    31 @@ -92,10 +95,6 @@ static void ssb_pmu0_pllinit_r0(struct ssb_chipcommon *cc, 
     29@@ -92,10 +95,6 @@ static void ssb_pmu0_pllinit_r0(struct s 
    3230        u32 pmuctl, tmp, pllctl; 
    3331        unsigned int i; 
     
    4038                e = pmu0_plltab_find_entry(crystalfreq); 
    4139        if (!e) 
    42 @@ -321,7 +320,11 @@ static void ssb_pmu_pll_init(struct ssb_chipcommon *cc) 
     40@@ -321,7 +320,11 @@ static void ssb_pmu_pll_init(struct ssb_ 
    4341        u32 crystalfreq = 0; /* in kHz. 0 = keep default freq. */ 
    4442  
     
    5351  
    5452        switch (bus->chip_id) { 
    55 @@ -330,7 +333,11 @@ static void ssb_pmu_pll_init(struct ssb_chipcommon *cc) 
     53@@ -330,7 +333,11 @@ static void ssb_pmu_pll_init(struct ssb_ 
    5654                ssb_pmu1_pllinit_r0(cc, crystalfreq); 
    5755                break; 
     
    6563                break; 
    6664        case 0x4322: 
    67 @@ -607,3 +614,34 @@ void ssb_pmu_set_ldo_paref(struct ssb_chipcommon *cc, bool on) 
     65@@ -607,3 +614,34 @@ void ssb_pmu_set_ldo_paref(struct ssb_ch 
    6866  
    6967 EXPORT_SYMBOL(ssb_pmu_set_ldo_voltage); 
     
    10098+       } 
    10199+} 
    102 diff --git a/drivers/ssb/driver_mipscore.c b/drivers/ssb/driver_mipscore.c 
    103 index ced5015..d784ec8 100644 
    104100--- a/drivers/ssb/driver_mipscore.c 
    105101+++ b/drivers/ssb/driver_mipscore.c 
    106 @@ -208,6 +208,9 @@ u32 ssb_cpu_clock(struct ssb_mipscore *mcore) 
     102@@ -232,6 +232,9 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m 
    107103        struct ssb_bus *bus = mcore->dev->bus; 
    108104        u32 pll_type, n, m, rate = 0; 
     
    114110                ssb_extif_get_clockcontrol(&bus->extif, &pll_type, &n, &m); 
    115111        } else if (bus->chipco.dev) { 
    116 diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c 
    117 index bb6317f..d109cf0 100644 
    118112--- a/drivers/ssb/main.c 
    119113+++ b/drivers/ssb/main.c 
     
    128122                ssb_extif_get_clockcontrol(&bus->extif, &plltype, 
    129123                                           &clkctl_n, &clkctl_m); 
    130 diff --git a/drivers/ssb/ssb_private.h b/drivers/ssb/ssb_private.h 
    131 index 7765301..a305550 100644 
    132124--- a/drivers/ssb/ssb_private.h 
    133125+++ b/drivers/ssb/ssb_private.h 
    134 @@ -207,4 +207,8 @@ static inline void b43_pci_ssb_bridge_exit(void) 
     126@@ -211,4 +211,8 @@ static inline void b43_pci_ssb_bridge_ex 
    135127 } 
    136128 #endif /* CONFIG_SSB_B43_PCI_BRIDGE */ 
     
    141133+ 
    142134 #endif /* LINUX_SSB_PRIVATE_H_ */ 
    143 --  
    144 1.7.5.4 
    145  
  • trunk/target/linux/brcm47xx/patches-3.2/976-ssb_increase_pci_delay.patch

    r29756 r30481  
    11--- a/drivers/ssb/driver_pcicore.c 
    22+++ b/drivers/ssb/driver_pcicore.c 
    3 @@ -373,7 +373,7 @@ static void __devinit ssb_pcicore_init_h 
     3@@ -376,7 +376,7 @@ static void __devinit ssb_pcicore_init_h 
    44        set_io_port_base(ssb_pcicore_controller.io_map_base); 
    55        /* Give some time to the PCI controller to configure itself with the new 
Note: See TracChangeset for help on using the changeset viewer.