diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2012-03-28 17:03:18 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2012-03-28 17:03:18 +0000 |
| commit | 145aa980fe699f4ecf18bd3e84f4ea581e14cb9e (patch) | |
| tree | b3ccfc93aae1387f67bd8067360f5b578f8d213b /target/linux/brcm47xx/patches-3.2/024-brcm47xx-add-common-interface-for-sflash.patch | |
| parent | da626c9676d32283a1505a41098c4c467631a7bf (diff) | |
| download | upstream-145aa980fe699f4ecf18bd3e84f4ea581e14cb9e.tar.gz upstream-145aa980fe699f4ecf18bd3e84f4ea581e14cb9e.tar.bz2 upstream-145aa980fe699f4ecf18bd3e84f4ea581e14cb9e.zip | |
brcm47xx: update flash drivers
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31126 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.2/024-brcm47xx-add-common-interface-for-sflash.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.2/024-brcm47xx-add-common-interface-for-sflash.patch | 33 |
1 files changed, 2 insertions, 31 deletions
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 6caa9180d7..1cf4ee6414 100644 --- 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 */ |