Commit ef6c3c6e authored by David Cross's avatar David Cross Committed by Greg Kroah-Hartman
Browse files

staging: west bridge: pnand hal fixes 



This patch includes changing some defines, necessary for compilation
with the linux-next tree.

Signed-off-by: default avatarDavid Cross <david.cross@cypress.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4c404487

drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c

+3 −3
Original line number Diff line number Diff line
@@ -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

drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyasmemmap.h

+6 −3
Original line number Diff line number Diff line
@@ -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)