diff mbox

ARM: OMAP2+: nand: Fix NAND on OMAP2 and OMAP3 boards

Message ID 1400070908-2929-1-git-send-email-rogerq@ti.com
State Accepted
Commit 5005e0b76781c37d0a16dd6dd17d015098e8ce92
Headers show

Commit Message

Roger Quadros May 14, 2014, 12:35 p.m. UTC
Commit c66d039197e4 broke NAND for non-DT boot on all OMAP2 and OMAP3
boards using board_nand_init(). Following error is seen at boot

[    0.154998]  (null): Unsupported NAND ECC scheme selected

For OMAP2 and OMAP3 platforms, the ecc_opt parameter in platform data
must be set to OMAP_ECC_HAM1_CODE_HW to work properly.

Tested on omap3-beagle c4.

Signed-off-by: Roger Quadros <rogerq@ti.com>
---
 arch/arm/mach-omap2/board-flash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tony Lindgren May 14, 2014, 3:30 p.m. UTC | #1
* Roger Quadros <rogerq@ti.com> [140514 05:36]:
> Commit c66d039197e4 broke NAND for non-DT boot on all OMAP2 and OMAP3
> boards using board_nand_init(). Following error is seen at boot
> 
> [    0.154998]  (null): Unsupported NAND ECC scheme selected
> 
> For OMAP2 and OMAP3 platforms, the ecc_opt parameter in platform data
> must be set to OMAP_ECC_HAM1_CODE_HW to work properly.
> 
> Tested on omap3-beagle c4.
> 
> Signed-off-by: Roger Quadros <rogerq@ti.com>

Thanks applying into fixes with Cc stable v3.12+.

Regards,

Tony

>  arch/arm/mach-omap2/board-flash.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-omap2/board-flash.c b/arch/arm/mach-omap2/board-flash.c
> index ac82512..b6885e4 100644
> --- a/arch/arm/mach-omap2/board-flash.c
> +++ b/arch/arm/mach-omap2/board-flash.c
> @@ -142,7 +142,7 @@ __init board_nand_init(struct mtd_partition *nand_parts, u8 nr_parts, u8 cs,
>  	board_nand_data.nr_parts	= nr_parts;
>  	board_nand_data.devsize		= nand_type;
>  
> -	board_nand_data.ecc_opt = OMAP_ECC_BCH8_CODE_HW;
> +	board_nand_data.ecc_opt = OMAP_ECC_HAM1_CODE_HW;
>  	gpmc_nand_init(&board_nand_data, gpmc_t);
>  }
>  #endif /* CONFIG_MTD_NAND_OMAP2 || CONFIG_MTD_NAND_OMAP2_MODULE */
> -- 
> 1.8.3.2
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/board-flash.c b/arch/arm/mach-omap2/board-flash.c
index ac82512..b6885e4 100644
--- a/arch/arm/mach-omap2/board-flash.c
+++ b/arch/arm/mach-omap2/board-flash.c
@@ -142,7 +142,7 @@  __init board_nand_init(struct mtd_partition *nand_parts, u8 nr_parts, u8 cs,
 	board_nand_data.nr_parts	= nr_parts;
 	board_nand_data.devsize		= nand_type;
 
-	board_nand_data.ecc_opt = OMAP_ECC_BCH8_CODE_HW;
+	board_nand_data.ecc_opt = OMAP_ECC_HAM1_CODE_HW;
 	gpmc_nand_init(&board_nand_data, gpmc_t);
 }
 #endif /* CONFIG_MTD_NAND_OMAP2 || CONFIG_MTD_NAND_OMAP2_MODULE */