diff options
| author | Daniel Schaeffer <daniel.schaeffer@timesys.com> | 2009-10-08 13:36:54 -0400 |
|---|---|---|
| committer | Daniel Schaeffer <daniel.schaeffer@timesys.com> | 2009-10-08 13:36:54 -0400 |
| commit | 6aa6681b4bf043b0b6181c61ffdc41fffa885ad0 (patch) | |
| tree | 91da9f17dd8a269dd0e6db816e2c22bfa01cc823 /include | |
| parent | fc6e894ba8850cdf81396b08406c4a85bfdce12f (diff) | |
This patch originally from LogicPD OMAP35x Release 1.6.1 Original Patch Name: u-boot-2009.03-lv-som-07-sync-flash.patch
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-omap3/cpu.h | 8 | ||||
| -rw-r--r-- | include/asm-arm/arch-omap3/mem.h | 8 | ||||
| -rw-r--r-- | include/asm-arm/arch-omap3/omap3.h | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/include/asm-arm/arch-omap3/cpu.h b/include/asm-arm/arch-omap3/cpu.h index 97ba14404c..0074cbe022 100644 --- a/include/asm-arm/arch-omap3/cpu.h +++ b/include/asm-arm/arch-omap3/cpu.h @@ -85,9 +85,11 @@ typedef struct ctrl_id { #define GPMC_BASE (OMAP34XX_GPMC_BASE) #define GPMC_CONFIG_CS0 0x60 #define GPMC_CONFIG_CS1 0x90 -#define GPMC_CONFIG_CS6 0x150 +#define GPMC_CONFIG_CS2 0xC0 +#define GPMC_CONFIG_CS6 0x180 #define GPMC_CONFIG_CS0_BASE (GPMC_BASE + GPMC_CONFIG_CS0) #define GPMC_CONFIG_CS1_BASE (GPMC_BASE + GPMC_CONFIG_CS1) +#define GPMC_CONFIG_CS2_BASE (GPMC_BASE + GPMC_CONFIG_CS2) #define GPMC_CONFIG_WP 0x10 #define GPMC_CONFIG_WIDTH 0x30 @@ -131,6 +133,10 @@ typedef struct gpmc_csx { unsigned int nand_adr; /* 0x20 */ unsigned int nand_dat; /* 0x24 */ } gpmc_csx_t; + +extern void enable_gpmc_config(unsigned int *gpmc_config, gpmc_csx_t *gpmc_cs_base, + unsigned int base, unsigned int size); + #else /* __ASSEMBLY__ */ #define GPMC_CONFIG1 0x00 #define GPMC_CONFIG2 0x04 diff --git a/include/asm-arm/arch-omap3/mem.h b/include/asm-arm/arch-omap3/mem.h index e0a2fa102d..149978c2b8 100644 --- a/include/asm-arm/arch-omap3/mem.h +++ b/include/asm-arm/arch-omap3/mem.h @@ -195,14 +195,6 @@ typedef enum { #define ONENAND_GPMC_CONFIG5 0x010F1010 #define ONENAND_GPMC_CONFIG6 0x1F060000 -// GPMC settings for LV SOM -#define LV_SOM_NET_GPMC_CONFIG1 0x00001000 -#define LV_SOM_NET_GPMC_CONFIG2 0x00080802 -#define LV_SOM_NET_GPMC_CONFIG3 0x00000000 -#define LV_SOM_NET_GPMC_CONFIG4 0x08020802 -#define LV_SOM_NET_GPMC_CONFIG5 0x00080a0a -#define LV_SOM_NET_GPMC_CONFIG6 0x00000000 -#define LV_SOM_NET_GPMC_CONFIG7 0x00000f48 #define NET_GPMC_CONFIG1 0x00001000 #define NET_GPMC_CONFIG2 0x001e1e01 diff --git a/include/asm-arm/arch-omap3/omap3.h b/include/asm-arm/arch-omap3/omap3.h index 6147299ac1..82767ecb19 100644 --- a/include/asm-arm/arch-omap3/omap3.h +++ b/include/asm-arm/arch-omap3/omap3.h @@ -175,6 +175,8 @@ typedef struct gpio { #define CPU_3430_ES1 1 #define CPU_3430_ES2 2 +#define TYPE_READTYPE 0x20000000 // Readtype, 1==sync + #define WIDTH_8BIT 0x0000 #define WIDTH_16BIT 0x1000 /* bit pos for 16 bit in gpmc */ |