diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2013-02-16 20:28:24 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2013-02-16 20:28:24 +0000 |
commit | 9f9982c1f703d0c9c8479c070e85ffdfeba72745 (patch) | |
tree | 9cd4c6ee2a098198b1c7e71c44edaee49213080f /target/linux/brcm47xx/patches-3.8/043-mtd-bcm47xxnflash-use-pr_fmt-for-module-prefix-in-me.patch | |
parent | 452522c6deabe5ff993d2091c3c19266690ee49a (diff) | |
download | upstream-9f9982c1f703d0c9c8479c070e85ffdfeba72745.tar.gz upstream-9f9982c1f703d0c9c8479c070e85ffdfeba72745.tar.bz2 upstream-9f9982c1f703d0c9c8479c070e85ffdfeba72745.zip |
brcm47xx: add initial support for kernel 3.8
This contains the following new bigger changes:
* new partition parser which still could lake some features or have bugs
* new nand flash driver
* using physmap-flash flash driver for parallel flash
* some changes to the serial flash driver
With these changes OpenWrt starts using more of the mainline flash drivers.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35632 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.8/043-mtd-bcm47xxnflash-use-pr_fmt-for-module-prefix-in-me.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.8/043-mtd-bcm47xxnflash-use-pr_fmt-for-module-prefix-in-me.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.8/043-mtd-bcm47xxnflash-use-pr_fmt-for-module-prefix-in-me.patch b/target/linux/brcm47xx/patches-3.8/043-mtd-bcm47xxnflash-use-pr_fmt-for-module-prefix-in-me.patch new file mode 100644 index 0000000000..2333454a47 --- /dev/null +++ b/target/linux/brcm47xx/patches-3.8/043-mtd-bcm47xxnflash-use-pr_fmt-for-module-prefix-in-me.patch @@ -0,0 +1,50 @@ +--- a/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h ++++ b/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h +@@ -1,6 +1,10 @@ + #ifndef __BCM47XXNFLASH_H + #define __BCM47XXNFLASH_H + ++#ifndef pr_fmt ++#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt ++#endif ++ + #include <linux/mtd/mtd.h> + #include <linux/mtd/nand.h> + +--- a/drivers/mtd/nand/bcm47xxnflash/main.c ++++ b/drivers/mtd/nand/bcm47xxnflash/main.c +@@ -9,14 +9,14 @@ + * + */ + ++#include "bcm47xxnflash.h" ++ + #include <linux/module.h> + #include <linux/kernel.h> + #include <linux/slab.h> + #include <linux/platform_device.h> + #include <linux/bcma/bcma.h> + +-#include "bcm47xxnflash.h" +- + MODULE_DESCRIPTION("NAND flash driver for BCMA bus"); + MODULE_LICENSE("GPL"); + MODULE_AUTHOR("Rafał Miłecki"); +--- a/drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c ++++ b/drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c +@@ -9,13 +9,13 @@ + * + */ + ++#include "bcm47xxnflash.h" ++ + #include <linux/module.h> + #include <linux/kernel.h> + #include <linux/slab.h> + #include <linux/bcma/bcma.h> + +-#include "bcm47xxnflash.h" +- + /* Broadcom uses 1'000'000 but it seems to be too many. Tests on WNDR4500 has + * shown ~1000 retries as maxiumum. */ + #define NFLASH_READY_RETRIES 10000 |