diff options
| -rw-r--r-- | board/omap3430lv_som/mem.c | 16 | ||||
| -rw-r--r-- | include/asm-arm/arch-omap3/mem.h | 7 |
2 files changed, 21 insertions, 2 deletions
diff --git a/board/omap3430lv_som/mem.c b/board/omap3430lv_som/mem.c index c8bb98c9d2b..39f80833762 100644 --- a/board/omap3430lv_som/mem.c +++ b/board/omap3430lv_som/mem.c @@ -96,6 +96,15 @@ static u32 gpmc_enet[GPMC_MAX_REG] = { OMAP3530LV_SOM_ENET_GPMC_CONFIG6, 0 }; +static u32 gpmc_m_isp1760[GPMC_MAX_REG] = { + OMAP3530LV_SOM_ISP1760_GPMC_CONFIG1, + OMAP3530LV_SOM_ISP1760_GPMC_CONFIG2, + OMAP3530LV_SOM_ISP1760_GPMC_CONFIG3, + OMAP3530LV_SOM_ISP1760_GPMC_CONFIG4, + OMAP3530LV_SOM_ISP1760_GPMC_CONFIG5, + OMAP3530LV_SOM_ISP1760_GPMC_CONFIG6, 0 +}; + #ifdef CFG_FIX_FLASH_SYNC static u32 gpmc_stnor_async[GPMC_MAX_REG] = { OMAP3530LV_SOM_STNOR_ASYNC_CONFIG1, @@ -472,13 +481,16 @@ void gpmc_init(void) } #endif -#if 1 + /* CS 3 (CompactFlash)*/ gpmc_config = gpmc_m_cf; gpmc_base = GPMC_CONFIG_CS0 + (3 * GPMC_CONFIG_WIDTH); enable_gpmc_config(gpmc_config, gpmc_base, 0x18000000, GPMC_SIZE_16M); -#endif + /* CS 6 (ISP1760)*/ + gpmc_config = gpmc_m_isp1760; + gpmc_base = GPMC_CONFIG_CS0 + (6 * GPMC_CONFIG_WIDTH); + enable_gpmc_config(gpmc_config, gpmc_base, 0x1c000000, GPMC_SIZE_16M); } void fix_flash_sync() diff --git a/include/asm-arm/arch-omap3/mem.h b/include/asm-arm/arch-omap3/mem.h index a30f88788ee..23a79f0b234 100644 --- a/include/asm-arm/arch-omap3/mem.h +++ b/include/asm-arm/arch-omap3/mem.h @@ -303,6 +303,13 @@ typedef enum { # define STNOR_GPMC_CONFIG5 0x01131F1F # define STNOR_GPMC_CONFIG6 0x1F0F04c4 +# define OMAP3530LV_SOM_ISP1760_GPMC_CONFIG1 0x00001200 +# define OMAP3530LV_SOM_ISP1760_GPMC_CONFIG2 0x00090901 +# define OMAP3530LV_SOM_ISP1760_GPMC_CONFIG3 0x00091001 +# define OMAP3530LV_SOM_ISP1760_GPMC_CONFIG4 0x07031002 +# define OMAP3530LV_SOM_ISP1760_GPMC_CONFIG5 0x00080c0a +# define OMAP3530LV_SOM_ISP1760_GPMC_CONFIG6 0x08030200 + # define OMAP3530LV_SOM_STNOR_ASYNC_CONFIG1 0x00491211 # define OMAP3530LV_SOM_STNOR_ASYNC_CONFIG2 0x00080901 # define OMAP3530LV_SOM_STNOR_ASYNC_CONFIG3 0x00020201 |