Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-09 03:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

nand: constify id/manu tables

Browse source 
These id tables need not be writable.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2010-10-20 01:15:21 +00:00 • committed by Scott Wood
parent 326a694527
commit 0bdecd82dd
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/mtd/nand/nand_base.c
View file

@ -2409,11 +2409,11 @@ static void nand_set_defaults(struct nand_chip *chip, int busw)
/* /*
* Get the flash and manufacturer id and lookup if the type is supported * Get the flash and manufacturer id and lookup if the type is supported
*/ */
static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, static const struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
struct nand_chip *chip, struct nand_chip *chip,
int busw, int *maf_id) int busw, int *maf_id)
{ {
struct nand_flash_dev *type = NULL; const struct nand_flash_dev *type = NULL;
int i, dev_id, maf_idx; int i, dev_id, maf_idx;
int tmp_id, tmp_manf; int tmp_id, tmp_manf;
@ -2587,7 +2587,7 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips)
{ {
int i, busw, nand_maf_id; int i, busw, nand_maf_id;
struct nand_chip *chip = mtd->priv; struct nand_chip *chip = mtd->priv;
struct nand_flash_dev *type; const struct nand_flash_dev *type;
/* Get buswidth to select the correct functions */ /* Get buswidth to select the correct functions */
busw = chip->options & NAND_BUSWIDTH_16; busw = chip->options & NAND_BUSWIDTH_16;

4
drivers/mtd/nand/nand_ids.c
View file

@ -22,7 +22,7 @@
+ 256 256 Byte page size + 256 256 Byte page size
* 512 512 Byte page size * 512 512 Byte page size
*/ */
struct nand_flash_dev nand_flash_ids[] = { const struct nand_flash_dev nand_flash_ids[] = {
#ifdef CONFIG_MTD_NAND_MUSEUM_IDS #ifdef CONFIG_MTD_NAND_MUSEUM_IDS
{"NAND 1MiB 5V 8-bit", 0x6e, 256, 1, 0x1000, 0}, {"NAND 1MiB 5V 8-bit", 0x6e, 256, 1, 0x1000, 0},
@ -132,7 +132,7 @@ struct nand_flash_dev nand_flash_ids[] = {
/* /*
* Manufacturer ID list * Manufacturer ID list
*/ */
struct nand_manufacturers nand_manuf_ids[] = { const struct nand_manufacturers nand_manuf_ids[] = {
{NAND_MFR_TOSHIBA, "Toshiba"}, {NAND_MFR_TOSHIBA, "Toshiba"},
{NAND_MFR_SAMSUNG, "Samsung"}, {NAND_MFR_SAMSUNG, "Samsung"},
{NAND_MFR_FUJITSU, "Fujitsu"}, {NAND_MFR_FUJITSU, "Fujitsu"},

4
include/linux/mtd/nand.h
View file

@ -470,8 +470,8 @@ struct nand_manufacturers {
char * name; char * name;
}; };
extern struct nand_flash_dev nand_flash_ids[]; extern const struct nand_flash_dev nand_flash_ids[];
extern struct nand_manufacturers nand_manuf_ids[]; extern const struct nand_manufacturers nand_manuf_ids[];
extern int nand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd); extern int nand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd);
extern int nand_update_bbt(struct mtd_info *mtd, loff_t offs); extern int nand_update_bbt(struct mtd_info *mtd, loff_t offs);