aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.3/020-ssb_update.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-09-12 22:03:45 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-09-12 22:03:45 +0000
commit614e8f44bdd07f32c296cc04a15eefb221060b5e (patch)
treeec12c1da849797d11559637600f48908301345c0 /target/linux/generic/patches-3.3/020-ssb_update.patch
parented6d759f394643c349c9baf268e3a24b7a1d2e13 (diff)
downloadupstream-614e8f44bdd07f32c296cc04a15eefb221060b5e.tar.gz
upstream-614e8f44bdd07f32c296cc04a15eefb221060b5e.tar.bz2
upstream-614e8f44bdd07f32c296cc04a15eefb221060b5e.zip
kernel: update bcma and ssb to wireless-testing master-2013-09-09
SVN-Revision: 37957
Diffstat (limited to 'target/linux/generic/patches-3.3/020-ssb_update.patch')
-rw-r--r--target/linux/generic/patches-3.3/020-ssb_update.patch12
1 files changed, 5 insertions, 7 deletions
diff --git a/target/linux/generic/patches-3.3/020-ssb_update.patch b/target/linux/generic/patches-3.3/020-ssb_update.patch
index 51b23b03f6..14ff3c5b0d 100644
--- a/target/linux/generic/patches-3.3/020-ssb_update.patch
+++ b/target/linux/generic/patches-3.3/020-ssb_update.patch
@@ -36,7 +36,7 @@
+config SSB_SFLASH
+ bool "SSB serial flash support"
-+ depends on SSB_DRIVER_MIPS && BROKEN
++ depends on SSB_DRIVER_MIPS
+ default y
+
# Assumption: We are on embedded, if we compile the MIPS core.
@@ -587,7 +587,7 @@
+EXPORT_SYMBOL_GPL(ssb_pmu_spuravoid_pllupdate);
--- /dev/null
+++ b/drivers/ssb/driver_chipcommon_sflash.c
-@@ -0,0 +1,166 @@
+@@ -0,0 +1,164 @@
+/*
+ * Sonics Silicon Backplane
+ * ChipCommon serial flash interface
@@ -741,8 +741,8 @@
+ sflash->size = sflash->blocksize * sflash->numblocks;
+ sflash->present = true;
+
-+ pr_info("Found %s serial flash (blocksize: 0x%X, blocks: %d)\n",
-+ e->name, e->blocksize, e->numblocks);
++ pr_info("Found %s serial flash (size: %dKiB, blocksize: 0x%X, blocks: %d)\n",
++ e->name, sflash->size / 1024, e->blocksize, e->numblocks);
+
+ /* Prepare platform device, but don't register it yet. It's too early,
+ * malloc (required by device_private_init) is not available yet. */
@@ -750,9 +750,7 @@
+ sflash->size;
+ ssb_sflash_dev.dev.platform_data = sflash;
+
-+ pr_err("Serial flash support is not implemented yet!\n");
-+
-+ return -ENOTSUPP;
++ return 0;
+}
--- a/drivers/ssb/driver_extif.c
+++ b/drivers/ssb/driver_extif.c