dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-09 20:52:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

mtd: nand: Rename nand_get_flash_type() into nand_detect()

Browse Source 
Upstream linux commit 7bb427990ee364.

Rename the function to match this new behavior.

NOTE: fix nand_detect/nand_get_flash_type parameters in
mxs_nand_spl. This code seems never executed by any board
as alternative for nand detect

Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
Reviewed-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
This commit is contained in:
Michael Trimarchi
2022-07-25 10:18:51 +02:00
parent c76f9ddf91
commit 6cda1dc210
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/mtd/nand/raw/mt7621_nand.c
View File

@@ -1186,8 +1186,7 @@ int mt7621_nfc_spl_post_init(struct mt7621_nfc *nfc)
int nand_maf_id, nand_dev_id; int nand_maf_id, nand_dev_id;
int ret; int ret;
ret = nand_get_flash_type(nand, &nand_maf_id, ret = nand_detect(nand, &nand_maf_id, &nand_dev_id, NULL);
&nand_dev_id, NULL);
if (ret) if (ret)
return ret; return ret;

2
drivers/mtd/nand/raw/mxs_nand_spl.c
View File

@@ -83,7 +83,7 @@ static int mxs_flash_full_ident(struct mtd_info *mtd)
struct nand_chip *chip = mtd_to_nand(mtd); struct nand_chip *chip = mtd_to_nand(mtd);
int ret; int ret;
ret = nand_get_flash_type(mtd, chip, &nand_maf_id, &nand_dev_id, NULL); ret = nand_detect(chip, &nand_maf_id, &nand_dev_id, NULL);
if (ret) { if (ret) {
chip->select_chip(mtd, -1); chip->select_chip(mtd, -1);

11
drivers/mtd/nand/raw/nand_base.c
View File

@@ -4276,8 +4276,8 @@ static const struct nand_manufacturer *nand_get_manufacturer_desc(u8 id)
/* /*
* 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.
*/ */
int nand_get_flash_type(struct nand_chip *chip, int *maf_id, int nand_detect(struct nand_chip *chip, int *maf_id,
int *dev_id, struct nand_flash_dev *type) int *dev_id, struct nand_flash_dev *type)
{ {
struct mtd_info *mtd = &chip->mtd; struct mtd_info *mtd = &chip->mtd;
const struct nand_manufacturer *manufacturer_desc; const struct nand_manufacturer *manufacturer_desc;
@@ -4461,7 +4461,7 @@ ident_done:
mtd->erasesize >> 10, mtd->writesize, mtd->oobsize); mtd->erasesize >> 10, mtd->writesize, mtd->oobsize);
return 0; return 0;
} }
EXPORT_SYMBOL(nand_get_flash_type); EXPORT_SYMBOL(nand_detect);
#if CONFIG_IS_ENABLED(OF_CONTROL) #if CONFIG_IS_ENABLED(OF_CONTROL)
@@ -4558,8 +4558,7 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips,
nand_set_defaults(chip, chip->options & NAND_BUSWIDTH_16); nand_set_defaults(chip, chip->options & NAND_BUSWIDTH_16);
/* Read the flash type */ /* Read the flash type */
ret = nand_get_flash_type(chip, &nand_maf_id, ret = nand_detect(chip, &nand_maf_id, &nand_dev_id, table);
&nand_dev_id, table);
if (ret) { if (ret) {
if (!(chip->options & NAND_SCAN_SILENT_NODEV)) if (!(chip->options & NAND_SCAN_SILENT_NODEV))
@@ -4591,7 +4590,7 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips,
for (i = 1; i < maxchips; i++) { for (i = 1; i < maxchips; i++) {
u8 id[2]; u8 id[2];
/* See comment in nand_get_flash_type for reset */ /* See comment in nand_detect for reset */
nand_reset(chip, i); nand_reset(chip, i);
chip->select_chip(mtd, i); chip->select_chip(mtd, i);

4
include/linux/mtd/rawnand.h
View File

@@ -29,8 +29,8 @@ struct nand_flash_dev;
struct device_node; struct device_node;
/* 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. */
int nand_get_flash_type(struct nand_chip *chip, int *maf_id, int *dev_id, int nand_detect(struct nand_chip *chip, int *maf_id, int *dev_id,
struct nand_flash_dev *type); struct nand_flash_dev *type);
/* Scan and identify a NAND device */ /* Scan and identify a NAND device */
int nand_scan(struct mtd_info *mtd, int max_chips); int nand_scan(struct mtd_info *mtd, int max_chips);