aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx/patches-3.14/140-bcma-only-map-wrap-if-it-is-not-null.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-05-29 19:25:40 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-05-29 19:25:40 +0000
commitcdc7ea333719e9896da1440f6bf0f0178023797e (patch)
treee601d47af81255f304cd77b310889ea3ccdf346f /target/linux/bcm53xx/patches-3.14/140-bcma-only-map-wrap-if-it-is-not-null.patch
parent50b663de47776e58c790488f6da914ce77eb5347 (diff)
downloadupstream-cdc7ea333719e9896da1440f6bf0f0178023797e.tar.gz
upstream-cdc7ea333719e9896da1440f6bf0f0178023797e.tar.bz2
upstream-cdc7ea333719e9896da1440f6bf0f0178023797e.zip
bcm53xx: add support for the PCIe controller
This patch adds support for the PCIe controller In addition to the PCIe controller a sprom is now provided by a device tree driver to bcma from some nvram. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 40880
Diffstat (limited to 'target/linux/bcm53xx/patches-3.14/140-bcma-only-map-wrap-if-it-is-not-null.patch')
-rw-r--r--target/linux/bcm53xx/patches-3.14/140-bcma-only-map-wrap-if-it-is-not-null.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/target/linux/bcm53xx/patches-3.14/140-bcma-only-map-wrap-if-it-is-not-null.patch b/target/linux/bcm53xx/patches-3.14/140-bcma-only-map-wrap-if-it-is-not-null.patch
new file mode 100644
index 0000000000..30e03e30e4
--- /dev/null
+++ b/target/linux/bcm53xx/patches-3.14/140-bcma-only-map-wrap-if-it-is-not-null.patch
@@ -0,0 +1,32 @@
+From f8ea60bbaf880d8d8d99fde3b5155f472e00141f Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Mon, 12 May 2014 20:16:39 +0200
+Subject: [PATCH 09/15] bcma: only map wrap if it is not null
+
+The chipcommon B core does not have a wrap address and it would fail here.
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ drivers/bcma/scan.c | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+--- a/drivers/bcma/scan.c
++++ b/drivers/bcma/scan.c
+@@ -421,10 +421,13 @@ static int bcma_get_next_core(struct bcm
+ core->io_addr = ioremap_nocache(core->addr, BCMA_CORE_SIZE);
+ if (!core->io_addr)
+ return -ENOMEM;
+- core->io_wrap = ioremap_nocache(core->wrap, BCMA_CORE_SIZE);
+- if (!core->io_wrap) {
+- iounmap(core->io_addr);
+- return -ENOMEM;
++ if (core->wrap) {
++ core->io_wrap = ioremap_nocache(core->wrap,
++ BCMA_CORE_SIZE);
++ if (!core->io_wrap) {
++ iounmap(core->io_addr);
++ return -ENOMEM;
++ }
+ }
+ }
+ return 0;