From 8a049dd642a1e51eed928dd12527325334bb2bd9 Mon Sep 17 00:00:00 2001 From: Grygorii Strashko Date: Mon, 26 Jun 2017 19:13:07 -0500 Subject: [PATCH] armv8: fsl-layerscape: use get_nand_dev_by_index() As part of preparation for nand DM conversion the new API has been introduced to remove direct access to nand_info array. So, use it here instead of accessing to nand_info array directly. Cc: Albert Aribaud Cc: York Sun Signed-off-by: Grygorii Strashko --- arch/arm/cpu/armv8/fsl-layerscape/ppa.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c index 35c612df05..24ddb5d991 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/ppa.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/ppa.c @@ -173,8 +173,9 @@ int ppa_init(void) debug("%s: PPA image load from NAND\n", __func__); nand_init(); - ret = nand_read(nand_info[0], (loff_t)CONFIG_SYS_LS_PPA_FW_ADDR, - &fdt_header_len, (u_char *)&fit); + ret = nand_read(get_nand_dev_by_index(0), + (loff_t)CONFIG_SYS_LS_PPA_FW_ADDR, + &fdt_header_len, (u_char *)&fit); if (ret == -EUCLEAN) { printf("NAND read of PPA FIT header at offset 0x%x failed\n", CONFIG_SYS_LS_PPA_FW_ADDR); @@ -196,8 +197,9 @@ int ppa_init(void) fw_length = CONFIG_LS_PPA_ESBC_HDR_SIZE; - ret = nand_read(nand_info[0], (loff_t)CONFIG_SYS_LS_PPA_ESBC_ADDR, - &fw_length, (u_char *)ppa_hdr_ddr); + ret = nand_read(get_nand_dev_by_index(0), + (loff_t)CONFIG_SYS_LS_PPA_ESBC_ADDR, + &fw_length, (u_char *)ppa_hdr_ddr); if (ret == -EUCLEAN) { free(ppa_hdr_ddr); printf("NAND read of PPA firmware at offset 0x%x failed\n", @@ -221,8 +223,9 @@ int ppa_init(void) return -ENOMEM; } - ret = nand_read(nand_info[0], (loff_t)CONFIG_SYS_LS_PPA_FW_ADDR, - &fw_length, (u_char *)ppa_fit_addr); + ret = nand_read(get_nand_dev_by_index(0), + (loff_t)CONFIG_SYS_LS_PPA_FW_ADDR, + &fw_length, (u_char *)ppa_fit_addr); if (ret == -EUCLEAN) { free(ppa_fit_addr); printf("NAND read of PPA firmware at offset 0x%x failed\n", -- 2.39.5