aboutsummaryrefslogtreecommitdiff
path: root/drivers/mtd/nand/raw/mt7621_nand.c
diff options
context:
space:
mode:
authorMichael Trimarchi <michael@amarulasolutions.com>2022-07-25 10:18:51 +0200
committerMichael Trimarchi <michael@amarulasolutions.com>2022-08-22 11:15:15 +0200
commit6cda1dc210304d8d74fd3c4b98b80b47ba1982c1 (patch)
treed6a5e5fd883dec37a18daeb0bebb198a1e1cc78e /drivers/mtd/nand/raw/mt7621_nand.c
parentc76f9ddf91b14312e71594459ebb3dd72d885aa8 (diff)
downloadu-boot-6cda1dc210304d8d74fd3c4b98b80b47ba1982c1.zip
u-boot-6cda1dc210304d8d74fd3c4b98b80b47ba1982c1.tar.gz
u-boot-6cda1dc210304d8d74fd3c4b98b80b47ba1982c1.tar.bz2
mtd: nand: Rename nand_get_flash_type() into nand_detect()
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>
Diffstat (limited to 'drivers/mtd/nand/raw/mt7621_nand.c')
-rw-r--r--drivers/mtd/nand/raw/mt7621_nand.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mtd/nand/raw/mt7621_nand.c b/drivers/mtd/nand/raw/mt7621_nand.c
index a4a0bce..f6eddb8 100644
--- a/drivers/mtd/nand/raw/mt7621_nand.c
+++ b/drivers/mtd/nand/raw/mt7621_nand.c
@@ -1186,8 +1186,7 @@ int mt7621_nfc_spl_post_init(struct mt7621_nfc *nfc)
int nand_maf_id, nand_dev_id;
int ret;
- ret = nand_get_flash_type(nand, &nand_maf_id,
- &nand_dev_id, NULL);
+ ret = nand_detect(nand, &nand_maf_id, &nand_dev_id, NULL);
if (ret)
return ret;