brcm47xx: update flash drivers

[openwrt/svn-archive/archive.git] / target / linux / brcm47xx / patches-3.2 / 024-brcm47xx-add-common-interface-for-sflash.patch

diff --git a/target/linux/brcm47xx/patches-3.2/024-brcm47xx-add-common-interface-for-sflash.patch b/target/linux/brcm47xx/patches-3.2/024-brcm47xx-add-common-interface-for-sflash.patch
index 6caa9180d7b8b9fd85d88fbce6473f422a4c3d28..1cf4ee64149d03492719594f5118f53fa52d029b 100644 (file)
--- a/target/linux/brcm47xx/patches-3.2/024-brcm47xx-add-common-interface-for-sflash.patch
+++ b/target/linux/brcm47xx/patches-3.2/024-brcm47xx-add-common-interface-for-sflash.patch
@@ -1,19 +1,3 @@
-From 4f314ac9edbc80897f158fdb4e1b1de8a2d0d432 Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Sun, 24 Jul 2011 21:10:49 +0200
-Subject: [PATCH 16/26] brcm47xx: add common interface for sflash
-
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
----
- arch/mips/bcm47xx/Makefile               |    2 +-
- arch/mips/bcm47xx/bus.c                  |   94 ++++++++++++++++++++++++++++++
- arch/mips/bcm47xx/setup.c                |    8 +++
- arch/mips/include/asm/mach-bcm47xx/bus.h |   37 ++++++++++++
- 4 files changed, 140 insertions(+), 1 deletions(-)
- create mode 100644 arch/mips/bcm47xx/bus.c
- create mode 100644 arch/mips/include/asm/mach-bcm47xx/bus.h
-
 --- a/arch/mips/bcm47xx/Makefile
 +++ b/arch/mips/bcm47xx/Makefile
 @@ -3,5 +3,5 @@
@@ -25,7 +9,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  obj-$(CONFIG_BCM47XX_SSB)     += wgt634u.o
 --- /dev/null
 +++ b/arch/mips/bcm47xx/bus.c
-@@ -0,0 +1,94 @@
+@@ -0,0 +1,82 @@
 +/*
 + * BCM947xx nvram variable access
 + *
@@ -59,11 +43,6 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +      return bcma_sflash_erase(dev->bcc, offset);
 +}
 +
-+static int bcm47xx_sflash_bcma_commit(struct bcm47xx_sflash *dev, u32 offset, u32 len, const u8 *buf)
-+{
-+      return bcma_sflash_commit(dev->bcc, offset, len, buf);
-+}
-+
 +void bcm47xx_sflash_struct_bcma_init(struct bcm47xx_sflash *sflash, struct bcma_drv_cc *bcc)
 +{
 +      sflash->sflash_type = BCM47XX_BUS_TYPE_BCMA;
@@ -73,7 +52,6 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +      sflash->poll = bcm47xx_sflash_bcma_poll;
 +      sflash->write = bcm47xx_sflash_bcma_write;
 +      sflash->erase = bcm47xx_sflash_bcma_erase;
-+      sflash->commit = bcm47xx_sflash_bcma_commit;
 +
 +      sflash->blocksize = bcc->sflash.blocksize;
 +      sflash->numblocks = bcc->sflash.numblocks;
@@ -100,11 +78,6 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +      return ssb_sflash_erase(dev->scc, offset);
 +}
 +
-+static int bcm47xx_sflash_ssb_commit(struct bcm47xx_sflash *dev, u32 offset, u32 len, const u8 *buf)
-+{
-+      return ssb_sflash_commit(dev->scc, offset, len, buf);
-+}
-+
 +void bcm47xx_sflash_struct_ssb_init(struct bcm47xx_sflash *sflash, struct ssb_chipcommon *scc)
 +{
 +      sflash->sflash_type = BCM47XX_BUS_TYPE_SSB;
@@ -114,7 +87,6 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +      sflash->poll = bcm47xx_sflash_ssb_poll;
 +      sflash->write = bcm47xx_sflash_ssb_write;
 +      sflash->erase = bcm47xx_sflash_ssb_erase;
-+      sflash->commit = bcm47xx_sflash_ssb_commit;
 +
 +      sflash->blocksize = scc->sflash.blocksize;
 +      sflash->numblocks = scc->sflash.numblocks;
@@ -153,7 +125,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  
 --- /dev/null
 +++ b/arch/mips/include/asm/mach-bcm47xx/bus.h
-@@ -0,0 +1,37 @@
+@@ -0,0 +1,36 @@
 +/*
 + * BCM947xx nvram variable access
 + *
@@ -180,7 +152,6 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +      int (*poll)(struct bcm47xx_sflash *dev, u32 offset);
 +      int (*write)(struct bcm47xx_sflash *dev, u32 offset, u32 len, const u8 *buf);
 +      int (*erase)(struct bcm47xx_sflash *dev, u32 offset);
-+      int (*commit)(struct bcm47xx_sflash *dev, u32 offset, u32 len, const u8 *buf);
 +
 +      u32 blocksize;          /* Block size */
 +      u32 numblocks;          /* Number of blocks */