diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-04-07 15:40:51 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-04-07 15:40:51 +0000 |
| commit | 503d845522a6173ff60b826a10c5d49089026ce0 (patch) | |
| tree | 18f79531154c28bd7f7004c6d2b2dd83563ea365 /target/linux/brcm47xx | |
| parent | b6e8da2e146824d14813eee749e39a56b615e639 (diff) | |
| download | upstream-503d845522a6173ff60b826a10c5d49089026ce0.tar.gz upstream-503d845522a6173ff60b826a10c5d49089026ce0.tar.bz2 upstream-503d845522a6173ff60b826a10c5d49089026ce0.zip | |
brcm47xx: drop old patch disabling cardbus mode on Netgear WNR834B
First of all this patch was affecting other devices, not just Netgear
WNR834B. E.g. Linksys WRT300N v1 also has boardtype 0x0472.
This was breaking PCI on WRT300N, ssb couldn't detect core working in
hostmode (due to mips_busprobe32 failing).
Secondly this patch should not be needed for years now. From the analyze
of #8861 it seems it was needed just to make devices at slots other than
0 discoverable. Setting cardbus to 0 was simply making ssb allow access
to PCI config for devices other than bridge.
With the upstream commit a6c8462 (ssb: fix cardbus slot in hostmode) we
allow accessing device at slot 1 which should be enough for CardBus.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 45293
Diffstat (limited to 'target/linux/brcm47xx')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.18/980-wnr834b_no_cardbus_invariant.patch | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/target/linux/brcm47xx/patches-3.18/980-wnr834b_no_cardbus_invariant.patch b/target/linux/brcm47xx/patches-3.18/980-wnr834b_no_cardbus_invariant.patch deleted file mode 100644 index 74a8916ab1..0000000000 --- a/target/linux/brcm47xx/patches-3.18/980-wnr834b_no_cardbus_invariant.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/arch/mips/bcm47xx/setup.c -+++ b/arch/mips/bcm47xx/setup.c -@@ -118,6 +118,10 @@ static int bcm47xx_get_invariants(struct - if (bcm47xx_nvram_getenv("cardbus", buf, sizeof(buf)) >= 0) - iv->has_cardbus_slot = !!simple_strtoul(buf, NULL, 10); - -+ /* Do not indicate cardbus for Netgear WNR834B V1 and V2 */ -+ if (iv->boardinfo.type == 0x0472 && iv->has_cardbus_slot) -+ iv->has_cardbus_slot = 0; -+ - return 0; - } - |