kernel: update bcma and ssb to wireless-testing master-2013-09-09

[openwrt/svn-archive/archive.git] / target / linux / generic / patches-3.3 / 020-ssb_update.patch

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 51b23b03f6aef06a0d76efc707b6cbe5a2b149fe..14ff3c5b0d6d5b4a7397085976c48bbea53053dc 100644 (file)
--- 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"
  
 +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.
 +      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
 +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
 +/*
 + * Sonics Silicon Backplane
 + * ChipCommon serial flash interface


@@ -741,8 +741,8 @@
 +      sflash->size = sflash->blocksize * sflash->numblocks;
 +      sflash->present = true;
 +
 +      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. */
 +
 +      /* 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;
 +
 +                                       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
 +}
 --- a/drivers/ssb/driver_extif.c
 +++ b/drivers/ssb/driver_extif.c