From 101aa7a3822d276b5604275f3e4b18b81b24de3f Mon Sep 17 00:00:00 2001 From: David Cross Date: Fri, 10 Sep 2010 16:57:56 -0700 Subject: [PATCH] --- yaml --- r: 219852 b: refs/heads/master c: ef6c3c6e53ba4286140ea7d582d81f08d43dc7d2 h: refs/heads/master v: v3 --- [refs] | 2 +- .../astoria/arch/arm/mach-omap2/cyashalomap_kernel.c | 6 +++--- .../westbridge/westbridge-omap3-pnand-hal/cyasmemmap.h | 9 ++++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 75e8698e5e5d..2f20beaa42bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c404487aa3d26bf7a7e16f8545778385e06d839 +refs/heads/master: ef6c3c6e53ba4286140ea7d582d81f08d43dc7d2 diff --git a/trunk/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c b/trunk/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c index a0759ee76249..ac3a4cf4216f 100644 --- a/trunk/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c +++ b/trunk/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c @@ -359,9 +359,9 @@ static int cy_as_hal_gpmc_init(void) /* * these are globals are full VMAs of the gpmc_base above */ - ncmd_reg_vma = GPMC_VMA(GPMC_NAND_CMD); - naddr_reg_vma = GPMC_VMA(GPMC_NAND_ADDR); - ndata_reg_vma = GPMC_VMA(GPMC_NAND_DATA); + ncmd_reg_vma = GPMC_VMA(AST_GPMC_NAND_CMD); + naddr_reg_vma = GPMC_VMA(AST_GPMC_NAND_ADDR); + ndata_reg_vma = GPMC_VMA(AST_GPMC_NAND_DATA); /* * request GPMC CS for ASTORIA request diff --git a/trunk/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasmemmap.h b/trunk/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasmemmap.h index 4377a34717b8..3eee192ffe89 100644 --- a/trunk/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasmemmap.h +++ b/trunk/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasmemmap.h @@ -31,6 +31,9 @@ #define _INCLUDED_CYASMEMMAP_H_ /* defines copied from OMAP kernel branch */ + +#define OMAP2_PULL_UP (1 << 4) +#define OMAP2_PULL_ENA (1 << 3) #define OMAP34XX_MUX_MODE0 0 #define OMAP34XX_MUX_MODE4 4 #define OMAP3_INPUT_EN (1 << 8) @@ -250,9 +253,9 @@ /* *gpmc nand registers for CS4 */ -#define GPMC_NAND_CMD (0x7c + (0x30*AST_GPMC_CS)) -#define GPMC_NAND_ADDR (0x80 + (0x30*AST_GPMC_CS)) -#define GPMC_NAND_DATA (0x84 + (0x30*AST_GPMC_CS)) +#define AST_GPMC_NAND_CMD (0x7c + (0x30*AST_GPMC_CS)) +#define AST_GPMC_NAND_ADDR (0x80 + (0x30*AST_GPMC_CS)) +#define AST_GPMC_NAND_DATA (0x84 + (0x30*AST_GPMC_CS)) #define GPMC_STAT_REG (0x54) #define GPMC_ERR_TYPE (0x48)