[PATCH 1/3] OMAP GPMC NAND: use buswidth from GPMC
Jan Weitzel
J.Weitzel at phytec.de
Thu Jul 19 04:31:28 EDT 2012
Am Donnerstag, den 19.07.2012, 00:11 +0200 schrieb Sascha Hauer:
> Hi Jan,
>
> On Wed, Jul 18, 2012 at 02:37:11PM +0200, Jan Weitzel wrote:
> > GPMC could be already configured by xloader or rom bootloader
> > Use the configured buswidth (width == 0) or set it explicit in the board file.
>
> What happens if it hasn't been configured by the ROM or xloader, for
> example when booting from MMC?
It will fall back to 8bit (GPMC register reset state). Have added this
to the commit message.
Booting from MMC is a problem for xloader and boards with 16bit NANDS.
We see the wrong buswidth in nand_base.c try to fix it after return to
gpmc_nand_probe. See the RFC mtd omap nand: reconfigure buswidth.
Did you see a better way?
Jan
> Sascha
>
> >
> > Use autodetect on pcm049
> >
> > Signed-off-by: Jan Weitzel <j.weitzel at phytec.de>
> > ---
> > arch/arm/boards/pcm049/board.c | 4 ++--
> > arch/arm/mach-omap/devices-gpmc-nand.c | 23 ++++++++++++++++++-----
> > arch/arm/mach-omap/gpmc.c | 19 +++++++++++++++++++
> > arch/arm/mach-omap/include/mach/gpmc.h | 8 ++++++++
> > 4 files changed, 47 insertions(+), 7 deletions(-)
> >
> > diff --git a/arch/arm/boards/pcm049/board.c b/arch/arm/boards/pcm049/board.c
> > index 3a2b574..4f056e0 100644
> > --- a/arch/arm/boards/pcm049/board.c
> > +++ b/arch/arm/boards/pcm049/board.c
> > @@ -112,9 +112,9 @@ static int pcm049_devices_init(void)
> >
> > pcm049_network_init();
> >
> > - gpmc_generic_nand_devices_init(0, 8,
> > + /* Autodetect buswidth*/
> > + gpmc_generic_nand_devices_init(0, 0,
> > OMAP_ECC_BCH8_CODE_HW, &omap4_nand_cfg);
> > -
> > #ifdef CONFIG_PARTITION
> > devfs_add_partition("nand0", 0x00000, SZ_128K,
> > DEVFS_PARTITION_FIXED, "xload_raw");
> > diff --git a/arch/arm/mach-omap/devices-gpmc-nand.c b/arch/arm/mach-omap/devices-gpmc-nand.c
> > index cf87b57..06f9576 100644
> > --- a/arch/arm/mach-omap/devices-gpmc-nand.c
> > +++ b/arch/arm/mach-omap/devices-gpmc-nand.c
> > @@ -35,9 +35,7 @@
> > #include <mach/silicon.h>
> > #include <mach/gpmc.h>
> > #include <mach/gpmc_nand.h>
> > -
> > -#define GPMC_CONF1_VALx8 0x00000800
> > -#define GPMC_CONF1_VALx16 0x00001800
> > +#include <mach/xload.h>
> >
> > /** NAND platform specific settings settings */
> > static struct gpmc_nand_platform_data nand_plat = {
> > @@ -51,15 +49,30 @@ static struct gpmc_nand_platform_data nand_plat = {
> > *
> > * @return success/fail based on device function
> > */
> > +
> > int gpmc_generic_nand_devices_init(int cs, int width,
> > enum gpmc_ecc_mode eccmode, struct gpmc_config *nand_cfg)
> > {
> > nand_plat.cs = cs;
> >
> > + if (width == 0) {
> > + struct gpmc_config cfg;
> > + /* try to get buswidth from gpmc */
> > + gpmc_get_config(cs, &cfg);
> > + width = (cfg.cfg[0] & GPMC_CONFIG1_DEVICETYPE_NAND) ? 16 : 8;
> > +
> > + if (!(cfg.cfg[0] & GPMC_CONFIG1_DEVICETYPE_NAND))
> > + debug("GPMC not configured for NAND, "
> > + "try width %d bit\n", width);
> > +
> > + debug("%s cfg0 %x width %d\n", __func__, cfg.cfg[0], width);
> > + }
> > +
> > if (width == 16)
> > - nand_cfg->cfg[0] = GPMC_CONF1_VALx16;
> > + nand_cfg->cfg[0] = GPMC_CONFIG1_DEVICETYPE_NAND |
> > + GPMC_CONFIG1_DEVICESIZE_16;
> > else
> > - nand_cfg->cfg[0] = GPMC_CONF1_VALx8;
> > + nand_cfg->cfg[0] = GPMC_CONFIG1_DEVICETYPE_NAND;
> >
> > nand_plat.device_width = width;
> > nand_plat.ecc_mode = eccmode;
> > diff --git a/arch/arm/mach-omap/gpmc.c b/arch/arm/mach-omap/gpmc.c
> > index e8946d7..399f68a 100644
> > --- a/arch/arm/mach-omap/gpmc.c
> > +++ b/arch/arm/mach-omap/gpmc.c
> > @@ -115,3 +115,22 @@ void gpmc_cs_config(char cs, struct gpmc_config *config)
> > mdelay(1); /* Settling time */
> > }
> > EXPORT_SYMBOL(gpmc_cs_config);
> > +
> > +void gpmc_get_config(char cs, struct gpmc_config *config)
> > +{
> > + unsigned int reg = GPMC_REG(CONFIG1_0) + (cs * GPMC_CONFIG_CS_SIZE);
> > + unsigned int cfg7;
> > + unsigned char i;
> > +
> > + /* Read the CFG1-6 regs */
> > + for (i = 0; i < 6; i++) {
> > + config->cfg[i] = readl(reg);
> > + reg += GPMC_CONFIG_REG_OFF;
> > + }
> > +
> > + cfg7 = readl(reg);
> > +
> > + config->size = (cfg7 >> 8) & 0xf;
> > + config->base = (cfg7 & 0x3F) << 24;
> > +}
> > +EXPORT_SYMBOL(gpmc_get_config);
> > diff --git a/arch/arm/mach-omap/include/mach/gpmc.h b/arch/arm/mach-omap/include/mach/gpmc.h
> > index 3ddc5f5..84260fc 100644
> > --- a/arch/arm/mach-omap/include/mach/gpmc.h
> > +++ b/arch/arm/mach-omap/include/mach/gpmc.h
> > @@ -140,6 +140,11 @@
> >
> > #define NAND_WP_BIT 0x00000010
> >
> > +#define GPMC_CONFIG1_DEVICESIZE(val) ((val & 3) << 12)
> > +#define GPMC_CONFIG1_DEVICESIZE_16 GPMC_CONFIG1_DEVICESIZE(1)
> > +#define GPMC_CONFIG1_DEVICETYPE(val) ((val & 3) << 10)
> > +#define GPMC_CONFIG1_DEVICETYPE_NAND GPMC_CONFIG1_DEVICETYPE(2)
> > +
> > #ifndef __ASSEMBLY__
> >
> > /** Generic GPMC configuration structure to be used to configure a
> > @@ -157,6 +162,9 @@ void gpmc_generic_init(unsigned int cfg);
> > /** Configuration for a specific chip select */
> > void gpmc_cs_config(char cs, struct gpmc_config *config);
> >
> > +/** Get Configuration for a specific chip select */
> > +void gpmc_get_config(char cs, struct gpmc_config *config);
> > +
> > #endif
> >
> > #endif /* __ASM_ARCH_OMAP_GPMC_H */
> > --
> > 1.7.0.4
> >
> >
> > _______________________________________________
> > barebox mailing list
> > barebox at lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/barebox
> >
>
More information about the barebox
mailing list