summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-02-12 16:45:27 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-02-12 16:45:27 +0000
commit1b56ff89986cdc568437df3847975dcc24ecb3a4 (patch)
tree6b21a427b528711d1f6e6fcf270001cca8bccd63
parent6d7798dc01d71f5db2a8d468a7cfdc67444ae090 (diff)
brcm47xx: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30481 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/brcm47xx/patches-3.2/0000-pci-backport.patch10
-rw-r--r--target/linux/brcm47xx/patches-3.2/0036-bcma-add-the-core-unit-number.patch6
-rw-r--r--target/linux/brcm47xx/patches-3.2/0041-bcma-add-bus-num-counter.patch2
-rw-r--r--target/linux/brcm47xx/patches-3.2/0042-bcma-add-new-PCI-ID.patch2
-rw-r--r--target/linux/brcm47xx/patches-3.2/0045-ssb-fix-cardbus-in-hostmode.patch2
-rw-r--r--target/linux/brcm47xx/patches-3.2/0047-bcma-log-the-id-rev-and-pkg-of-the-chip-found.patch4
-rw-r--r--target/linux/brcm47xx/patches-3.2/220-bcm5354.patch23
-rw-r--r--target/linux/brcm47xx/patches-3.2/976-ssb_increase_pci_delay.patch2
8 files changed, 20 insertions, 31 deletions
diff --git a/target/linux/brcm47xx/patches-3.2/0000-pci-backport.patch b/target/linux/brcm47xx/patches-3.2/0000-pci-backport.patch
index 5a6a9aeda..2a31a2089 100644
--- a/target/linux/brcm47xx/patches-3.2/0000-pci-backport.patch
+++ b/target/linux/brcm47xx/patches-3.2/0000-pci-backport.patch
@@ -1358,7 +1358,7 @@
int busnum;
};
-@@ -261,23 +261,20 @@ static void add_resources(struct pci_roo
+@@ -275,23 +275,20 @@ static void add_resources(struct pci_roo
"ignoring host bridge window %pR (conflicts with %s %pR)\n",
res, conflict->name, conflict);
else
@@ -1385,7 +1385,7 @@
acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_resource,
&info);
if (!info.res_num)
-@@ -286,7 +283,7 @@ get_current_resources(struct acpi_device
+@@ -300,7 +297,7 @@ get_current_resources(struct acpi_device
size = sizeof(*info.res) * info.res_num;
info.res = kmalloc(size, GFP_KERNEL);
if (!info.res)
@@ -1394,7 +1394,7 @@
info.name = kasprintf(GFP_KERNEL, "PCI Bus %04x:%02x", domain, busnum);
if (!info.name)
-@@ -301,8 +298,6 @@ get_current_resources(struct acpi_device
+@@ -315,8 +312,6 @@ get_current_resources(struct acpi_device
name_alloc_fail:
kfree(info.res);
@@ -1403,7 +1403,7 @@
}
struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root)
-@@ -310,6 +305,7 @@ struct pci_bus * __devinit pci_acpi_scan
+@@ -324,6 +319,7 @@ struct pci_bus * __devinit pci_acpi_scan
struct acpi_device *device = root->device;
int domain = root->segment;
int busnum = root->secondary.start;
@@ -1411,7 +1411,7 @@
struct pci_bus *bus;
struct pci_sysdata *sd;
int node;
-@@ -364,11 +360,15 @@ struct pci_bus * __devinit pci_acpi_scan
+@@ -378,11 +374,15 @@ struct pci_bus * __devinit pci_acpi_scan
memcpy(bus->sysdata, sd, sizeof(*sd));
kfree(sd);
} else {
diff --git a/target/linux/brcm47xx/patches-3.2/0036-bcma-add-the-core-unit-number.patch b/target/linux/brcm47xx/patches-3.2/0036-bcma-add-the-core-unit-number.patch
index 2c41a3008..cba9a6398 100644
--- a/target/linux/brcm47xx/patches-3.2/0036-bcma-add-the-core-unit-number.patch
+++ b/target/linux/brcm47xx/patches-3.2/0036-bcma-add-the-core-unit-number.patch
@@ -32,7 +32,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
static int bcma_get_next_core(struct bcma_bus *bus, u32 __iomem **eromptr,
struct bcma_device_id *match, int core_num,
struct bcma_device *core)
-@@ -407,6 +418,7 @@ int bcma_bus_scan(struct bcma_bus *bus)
+@@ -392,6 +403,7 @@ int bcma_bus_scan(struct bcma_bus *bus)
bcma_scan_switch_core(bus, erombase);
while (eromptr < eromend) {
@@ -40,7 +40,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
struct bcma_device *core = kzalloc(sizeof(*core), GFP_KERNEL);
if (!core)
return -ENOMEM;
-@@ -426,6 +438,8 @@ int bcma_bus_scan(struct bcma_bus *bus)
+@@ -411,6 +423,8 @@ int bcma_bus_scan(struct bcma_bus *bus)
core->core_index = core_num++;
bus->nr_cores++;
@@ -58,4 +58,4 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+ u8 core_unit;
u32 addr;
- u32 addr1;
+ u32 wrap;
diff --git a/target/linux/brcm47xx/patches-3.2/0041-bcma-add-bus-num-counter.patch b/target/linux/brcm47xx/patches-3.2/0041-bcma-add-bus-num-counter.patch
index 8d49e1ce2..14d112746 100644
--- a/target/linux/brcm47xx/patches-3.2/0041-bcma-add-bus-num-counter.patch
+++ b/target/linux/brcm47xx/patches-3.2/0041-bcma-add-bus-num-counter.patch
@@ -49,7 +49,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
if (err) {
--- a/include/linux/bcma/bcma.h
+++ b/include/linux/bcma/bcma.h
-@@ -197,6 +197,7 @@ struct bcma_bus {
+@@ -196,6 +196,7 @@ struct bcma_bus {
struct list_head cores;
u8 nr_cores;
u8 init_done:1;
diff --git a/target/linux/brcm47xx/patches-3.2/0042-bcma-add-new-PCI-ID.patch b/target/linux/brcm47xx/patches-3.2/0042-bcma-add-new-PCI-ID.patch
index efce69f15..72463d454 100644
--- a/target/linux/brcm47xx/patches-3.2/0042-bcma-add-new-PCI-ID.patch
+++ b/target/linux/brcm47xx/patches-3.2/0042-bcma-add-new-PCI-ID.patch
@@ -14,7 +14,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
--- a/drivers/bcma/host_pci.c
+++ b/drivers/bcma/host_pci.c
-@@ -275,6 +275,7 @@ static DEFINE_PCI_DEVICE_TABLE(bcma_pci_
+@@ -278,6 +278,7 @@ static DEFINE_PCI_DEVICE_TABLE(bcma_pci_
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) },
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4357) },
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },
diff --git a/target/linux/brcm47xx/patches-3.2/0045-ssb-fix-cardbus-in-hostmode.patch b/target/linux/brcm47xx/patches-3.2/0045-ssb-fix-cardbus-in-hostmode.patch
index 4837fe740..d26807f3e 100644
--- a/target/linux/brcm47xx/patches-3.2/0045-ssb-fix-cardbus-in-hostmode.patch
+++ b/target/linux/brcm47xx/patches-3.2/0045-ssb-fix-cardbus-in-hostmode.patch
@@ -19,4 +19,4 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+ if (pc->cardbusmode && (dev > 1))
goto out;
- /* Type 0 transaction */
+ if (bus == 0) {
diff --git a/target/linux/brcm47xx/patches-3.2/0047-bcma-log-the-id-rev-and-pkg-of-the-chip-found.patch b/target/linux/brcm47xx/patches-3.2/0047-bcma-log-the-id-rev-and-pkg-of-the-chip-found.patch
index 7ed7bc902..ce16cac3c 100644
--- a/target/linux/brcm47xx/patches-3.2/0047-bcma-log-the-id-rev-and-pkg-of-the-chip-found.patch
+++ b/target/linux/brcm47xx/patches-3.2/0047-bcma-log-the-id-rev-and-pkg-of-the-chip-found.patch
@@ -13,7 +13,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
--- a/drivers/bcma/scan.c
+++ b/drivers/bcma/scan.c
-@@ -380,6 +380,7 @@ static int bcma_get_next_core(struct bcm
+@@ -364,6 +364,7 @@ static int bcma_get_next_core(struct bcm
void bcma_init_bus(struct bcma_bus *bus)
{
s32 tmp;
@@ -21,7 +21,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
if (bus->init_done)
return;
-@@ -390,9 +391,12 @@ void bcma_init_bus(struct bcma_bus *bus)
+@@ -374,9 +375,12 @@ void bcma_init_bus(struct bcma_bus *bus)
bcma_scan_switch_core(bus, BCMA_ADDR_BASE);
tmp = bcma_scan_read32(bus, 0, BCMA_CC_ID);
diff --git a/target/linux/brcm47xx/patches-3.2/220-bcm5354.patch b/target/linux/brcm47xx/patches-3.2/220-bcm5354.patch
index e8c7dde69..1998bbef0 100644
--- a/target/linux/brcm47xx/patches-3.2/220-bcm5354.patch
+++ b/target/linux/brcm47xx/patches-3.2/220-bcm5354.patch
@@ -14,8 +14,6 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
drivers/ssb/ssb_private.h | 4 +++
4 files changed, 53 insertions(+), 5 deletions(-)
-diff --git a/drivers/ssb/driver_chipcommon_pmu.c b/drivers/ssb/driver_chipcommon_pmu.c
-index e5a2e0e..b58fef7 100644
--- a/drivers/ssb/driver_chipcommon_pmu.c
+++ b/drivers/ssb/driver_chipcommon_pmu.c
@@ -13,6 +13,9 @@
@@ -28,7 +26,7 @@ index e5a2e0e..b58fef7 100644
#include "ssb_private.h"
-@@ -92,10 +95,6 @@ static void ssb_pmu0_pllinit_r0(struct ssb_chipcommon *cc,
+@@ -92,10 +95,6 @@ static void ssb_pmu0_pllinit_r0(struct s
u32 pmuctl, tmp, pllctl;
unsigned int i;
@@ -39,7 +37,7 @@ index e5a2e0e..b58fef7 100644
if (crystalfreq)
e = pmu0_plltab_find_entry(crystalfreq);
if (!e)
-@@ -321,7 +320,11 @@ static void ssb_pmu_pll_init(struct ssb_chipcommon *cc)
+@@ -321,7 +320,11 @@ static void ssb_pmu_pll_init(struct ssb_
u32 crystalfreq = 0; /* in kHz. 0 = keep default freq. */
if (bus->bustype == SSB_BUSTYPE_SSB) {
@@ -52,7 +50,7 @@ index e5a2e0e..b58fef7 100644
}
switch (bus->chip_id) {
-@@ -330,7 +333,11 @@ static void ssb_pmu_pll_init(struct ssb_chipcommon *cc)
+@@ -330,7 +333,11 @@ static void ssb_pmu_pll_init(struct ssb_
ssb_pmu1_pllinit_r0(cc, crystalfreq);
break;
case 0x4328:
@@ -64,7 +62,7 @@ index e5a2e0e..b58fef7 100644
ssb_pmu0_pllinit_r0(cc, crystalfreq);
break;
case 0x4322:
-@@ -607,3 +614,34 @@ void ssb_pmu_set_ldo_paref(struct ssb_chipcommon *cc, bool on)
+@@ -607,3 +614,34 @@ void ssb_pmu_set_ldo_paref(struct ssb_ch
EXPORT_SYMBOL(ssb_pmu_set_ldo_voltage);
EXPORT_SYMBOL(ssb_pmu_set_ldo_paref);
@@ -99,11 +97,9 @@ index e5a2e0e..b58fef7 100644
+ return 0;
+ }
+}
-diff --git a/drivers/ssb/driver_mipscore.c b/drivers/ssb/driver_mipscore.c
-index ced5015..d784ec8 100644
--- a/drivers/ssb/driver_mipscore.c
+++ b/drivers/ssb/driver_mipscore.c
-@@ -208,6 +208,9 @@ u32 ssb_cpu_clock(struct ssb_mipscore *mcore)
+@@ -232,6 +232,9 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m
struct ssb_bus *bus = mcore->dev->bus;
u32 pll_type, n, m, rate = 0;
@@ -113,8 +109,6 @@ index ced5015..d784ec8 100644
if (bus->extif.dev) {
ssb_extif_get_clockcontrol(&bus->extif, &pll_type, &n, &m);
} else if (bus->chipco.dev) {
-diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
-index bb6317f..d109cf0 100644
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -1094,6 +1094,9 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
@@ -127,11 +121,9 @@ index bb6317f..d109cf0 100644
if (ssb_extif_available(&bus->extif))
ssb_extif_get_clockcontrol(&bus->extif, &plltype,
&clkctl_n, &clkctl_m);
-diff --git a/drivers/ssb/ssb_private.h b/drivers/ssb/ssb_private.h
-index 7765301..a305550 100644
--- a/drivers/ssb/ssb_private.h
+++ b/drivers/ssb/ssb_private.h
-@@ -207,4 +207,8 @@ static inline void b43_pci_ssb_bridge_exit(void)
+@@ -211,4 +211,8 @@ static inline void b43_pci_ssb_bridge_ex
}
#endif /* CONFIG_SSB_B43_PCI_BRIDGE */
@@ -140,6 +132,3 @@ index 7765301..a305550 100644
+extern u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc);
+
#endif /* LINUX_SSB_PRIVATE_H_ */
---
-1.7.5.4
-
diff --git a/target/linux/brcm47xx/patches-3.2/976-ssb_increase_pci_delay.patch b/target/linux/brcm47xx/patches-3.2/976-ssb_increase_pci_delay.patch
index ab57225e7..eb70c81e6 100644
--- a/target/linux/brcm47xx/patches-3.2/976-ssb_increase_pci_delay.patch
+++ b/target/linux/brcm47xx/patches-3.2/976-ssb_increase_pci_delay.patch
@@ -1,6 +1,6 @@
--- a/drivers/ssb/driver_pcicore.c
+++ b/drivers/ssb/driver_pcicore.c
-@@ -373,7 +373,7 @@ static void __devinit ssb_pcicore_init_h
+@@ -376,7 +376,7 @@ static void __devinit ssb_pcicore_init_h
set_io_port_base(ssb_pcicore_controller.io_map_base);
/* Give some time to the PCI controller to configure itself with the new
* values. Not waiting at this point causes crashes of the machine. */