diff options
| author | Ladislav Michl <ladis@linux-mips.org> | 2016-07-12 20:28:15 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-22 09:53:00 -0400 |
| commit | b1509e3a4aa55b003e814386dd83972858544e55 (patch) | |
| tree | fadcc44edc93bda36df47aea7504e56188a79038 /arch/arm/include | |
| parent | 431889d6ad9a39846636716478d504aa7ff976fc (diff) | |
| download | u-boot-imx-b1509e3a4aa55b003e814386dd83972858544e55.zip u-boot-imx-b1509e3a4aa55b003e814386dd83972858544e55.tar.gz u-boot-imx-b1509e3a4aa55b003e814386dd83972858544e55.tar.bz2 | |
armv7: add reset timeout to identify_nand_chip
identify_nand_chip hangs forever in loop when NAND is not present.
As IGEPv2 comes either with NAND or OneNAND flash, add reset timeout
to let function fail gracefully allowing caller to know NAND is
not present. On NAND equipped board, reset succeeds on first read,
so 1000 loops seems to be safe timeout.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/arch-omap3/sys_proto.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-omap3/sys_proto.h b/arch/arm/include/asm/arch-omap3/sys_proto.h index 24563c0..1be2b15 100644 --- a/arch/arm/include/asm/arch-omap3/sys_proto.h +++ b/arch/arm/include/asm/arch-omap3/sys_proto.h @@ -40,7 +40,7 @@ void sdrc_init(void); void do_sdrc_init(u32, u32); void get_board_mem_timings(struct board_sdrc_timings *timings); -void identify_nand_chip(int *mfr, int *id); +int identify_nand_chip(int *mfr, int *id); void emif4_init(void); void gpmc_init(void); void enable_gpmc_cs_config(const u32 *gpmc_config, struct gpmc_cs *cs, u32 base, |