diff options
| author | David Cross <david.cross@cypress.com> | 2010-09-10 16:57:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-14 16:52:47 -0700 |
| commit | ef6c3c6e53ba4286140ea7d582d81f08d43dc7d2 (patch) | |
| tree | 46559df6399d43f31dfef3bd03143f51d691f3aa /drivers | |
| parent | 4c404487aa3d26bf7a7e16f8545778385e06d839 (diff) | |
| download | linux-stable-ef6c3c6e53ba4286140ea7d582d81f08d43dc7d2.tar.gz linux-stable-ef6c3c6e53ba4286140ea7d582d81f08d43dc7d2.tar.bz2 linux-stable-ef6c3c6e53ba4286140ea7d582d81f08d43dc7d2.zip | |
staging: west bridge: pnand hal fixes
This patch includes changing some defines, necessary for compilation
with the linux-next tree.
Signed-off-by: David Cross <david.cross@cypress.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
2 files changed, 9 insertions, 6 deletions
diff --git a/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c b/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c index a0759ee76249..ac3a4cf4216f 100644 --- a/drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c +++ b/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/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasmemmap.h b/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasmemmap.h index 4377a34717b8..3eee192ffe89 100644 --- a/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasmemmap.h +++ b/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) |