diff options
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/atmel_nand.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/nand/nand_denali.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/nand_omap_bch_decoder.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/nand_omap_bch_decoder.h | 6 | ||||
| -rw-r--r-- | drivers/mtd/nand/nand_omap_gpmc.c | 4 |
5 files changed, 11 insertions, 4 deletions
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index 797cdc2ba6..4c1725d096 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c @@ -788,7 +788,6 @@ static int pmecc_build_galois_table(unsigned int mm, int16_t *index_of, case 3: case 4: case 6: - case 15: p[1] = 1; break; case 5: diff --git a/drivers/mtd/nand/nand_denali.c b/drivers/mtd/nand/nand_denali.c index c530a80bde..2561966243 100644 --- a/drivers/mtd/nand/nand_denali.c +++ b/drivers/mtd/nand/nand_denali.c @@ -1387,7 +1387,7 @@ int denali_init(struct denali_nand_info *denali) } /* allocate a temporary buffer for nand_scan_ident() */ - denali->buf.buf = kzalloc(PAGE_SIZE, GFP_DMA | GFP_KERNEL); + denali->buf.buf = kzalloc(PAGE_SIZE, GFP_KERNEL); if (!denali->buf.buf) return -ENOMEM; diff --git a/drivers/mtd/nand/nand_omap_bch_decoder.c b/drivers/mtd/nand/nand_omap_bch_decoder.c index 64e8031785..4dd28a7704 100644 --- a/drivers/mtd/nand/nand_omap_bch_decoder.c +++ b/drivers/mtd/nand/nand_omap_bch_decoder.c @@ -15,6 +15,8 @@ #include <common.h> +#include "nand_omap_bch_decoder.h" + #define mm 13 #define kk_shorten 4096 #define nn 8191 /* Length of codeword, n = 2**mm - 1 */ diff --git a/drivers/mtd/nand/nand_omap_bch_decoder.h b/drivers/mtd/nand/nand_omap_bch_decoder.h new file mode 100644 index 0000000000..74d24be028 --- /dev/null +++ b/drivers/mtd/nand/nand_omap_bch_decoder.h @@ -0,0 +1,6 @@ +#ifndef MTD_OMAP_GPMC_DECODE_BCH_H +#define MTD_OMAP_GPMC_DECODE_BCH_H + +int omap_gpmc_decode_bch(int select_4_8, unsigned char *ecc, unsigned int *err_loc); + +#endif /* MTD_OMAP_GPMC_DECODE_BCH_H */
\ No newline at end of file diff --git a/drivers/mtd/nand/nand_omap_gpmc.c b/drivers/mtd/nand/nand_omap_gpmc.c index d0b1699839..323a9c7532 100644 --- a/drivers/mtd/nand/nand_omap_gpmc.c +++ b/drivers/mtd/nand/nand_omap_gpmc.c @@ -71,6 +71,8 @@ #include <mach/gpmc.h> #include <mach/gpmc_nand.h> +#include "nand_omap_bch_decoder.h" + #define GPMC_ECC_CONFIG_ECCENABLE (1 << 0) #define GPMC_ECC_CONFIG_ECCCS(x) (((x) & 0x7) << 1) #define GPMC_ECC_CONFIG_ECCTOPSECTOR(x) (((x) & 0x7) << 4) @@ -90,8 +92,6 @@ static const uint8_t bch8_vector[] = {0xf3, 0xdb, 0x14, 0x16, 0x8b, 0xd2, 0xbe, 0xcc, 0xac, 0x6b, 0xff, 0x99, 0x7b}; -int omap_gpmc_decode_bch(int select_4_8, unsigned char *ecc, unsigned int *err_loc); - static const char *ecc_mode_strings[] = { "software", "hamming_hw_romcode", |