Message ID | 1384781582-31773-1-git-send-email-pekon@ti.com |
---|---|
State | Not Applicable |
Delegated to: | Tom Rini |
Headers | show |
On Mon, Nov 18, 2013 at 07:02:58PM +0530, Pekon Gupta wrote: [..] > > Pekon Gupta (4): > mtd: nand: omap: make am33xx/elm.c as common driver for all OMAPx and > AMxxxx platforms > mtd: nand: omap: enable BCH ECC scheme using ELM for generic platform > mtd: nand: omap: add CONFIG_NAND_OMAP_ECCSCHEME for selection of > ecc-scheme > am335x: fix GPMC config for NAND and NOR SPL boot > > arch/arm/cpu/armv7/am33xx/Makefile | 1 - > arch/arm/cpu/armv7/am33xx/mem.c | 52 ++-- > arch/arm/include/asm/arch-am33xx/mem.h | 5 - > .../include/asm/{arch-am33xx/elm.h => omap_elm.h} | 0 > arch/arm/include/asm/omap_gpmc.h | 16 + > board/ti/am335x/board.c | 14 +- > doc/README.nand | 53 ++++ > doc/README.omap3 | 3 +- > drivers/mtd/nand/Makefile | 1 + > .../am33xx/elm.c => drivers/mtd/nand/omap_elm.c | 6 +- > drivers/mtd/nand/omap_gpmc.c | 323 +++++++++++++-------- > include/configs/am335x_evm.h | 5 +- > include/configs/am335x_igep0033.h | 2 + > include/configs/am3517_crane.h | 1 + > include/configs/am3517_evm.h | 1 + > include/configs/devkit8000.h | 1 + > include/configs/mcx.h | 2 +- > include/configs/omap3_beagle.h | 1 + > include/configs/omap3_evm.h | 1 + > include/configs/omap3_evm_quick_nand.h | 1 + > include/configs/omap3_igep00x0.h | 1 + > include/configs/omap3_overo.h | 1 + > include/configs/siemens-am33x-common.h | 2 + > include/configs/tam3517-common.h | 2 +- > include/configs/tricorder.h | 2 +- > 25 files changed, 321 insertions(+), 176 deletions(-) > rename arch/arm/include/asm/{arch-am33xx/elm.h => omap_elm.h} (100%) > rename arch/arm/cpu/armv7/am33xx/elm.c => drivers/mtd/nand/omap_elm.c (97%) > Tested-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> -----Original Message----- > From: Pekon Gupta [mailto:pekon@ti.com] [...] > > Pekon Gupta (4): > mtd: nand: omap: make am33xx/elm.c as common driver for all OMAPx and > AMxxxx platforms > mtd: nand: omap: enable BCH ECC scheme using ELM for generic platform > mtd: nand: omap: add CONFIG_NAND_OMAP_ECCSCHEME for selection of > ecc-scheme > am335x: fix GPMC config for NAND and NOR SPL boot > > arch/arm/cpu/armv7/am33xx/Makefile | 1 - > arch/arm/cpu/armv7/am33xx/mem.c | 52 ++-- > arch/arm/include/asm/arch-am33xx/mem.h | 5 - > .../include/asm/{arch-am33xx/elm.h => omap_elm.h} | 0 > arch/arm/include/asm/omap_gpmc.h | 16 + > board/ti/am335x/board.c | 14 +- > doc/README.nand | 53 ++++ > doc/README.omap3 | 3 +- > drivers/mtd/nand/Makefile | 1 + > .../am33xx/elm.c => drivers/mtd/nand/omap_elm.c | 6 +- > drivers/mtd/nand/omap_gpmc.c | 323 +++++++++++++------- > - > include/configs/am335x_evm.h | 5 +- > include/configs/am335x_igep0033.h | 2 + > include/configs/am3517_crane.h | 1 + > include/configs/am3517_evm.h | 1 + > include/configs/devkit8000.h | 1 + > include/configs/mcx.h | 2 +- > include/configs/omap3_beagle.h | 1 + > include/configs/omap3_evm.h | 1 + > include/configs/omap3_evm_quick_nand.h | 1 + > include/configs/omap3_igep00x0.h | 1 + > include/configs/omap3_overo.h | 1 + > include/configs/siemens-am33x-common.h | 2 + > include/configs/tam3517-common.h | 2 +- > include/configs/tricorder.h | 2 +- > 25 files changed, 321 insertions(+), 176 deletions(-) > rename arch/arm/include/asm/{arch-am33xx/elm.h => omap_elm.h} (100%) > rename arch/arm/cpu/armv7/am33xx/elm.c => drivers/mtd/nand/omap_elm.c (97%) > > -- > 1.8.1 Reviewed-by: Roger Meier <r.meier@siemens.com> Thanks! -roger
diff --git a/arch/arm/cpu/armv7/am33xx/mem.c b/arch/arm/cpu/armv7/am33xx/mem.c index 56c9e7d..b166a94 100644 --- a/arch/arm/cpu/armv7/am33xx/mem.c +++ b/arch/arm/cpu/armv7/am33xx/mem.c @@ -64,7 +64,7 @@ void gpmc_init(void) u32 base = CONFIG_SYS_FLASH_BASE; #elif defined(CONFIG_NAND) /* configure GPMC for NAND */ - const u32 gpmc_regs[GPMC_MAX_REG] = { M_NAND_GPMC_CONFIG1, + const u32 gpmc_regs[GPMC_MAX_REG] = { M_NAND_GPMC_CONFIG1 | 0x1000, M_NAND_GPMC_CONFIG2, M_NAND_GPMC_CONFIG3, M_NAND_GPMC_CONFIG4,