diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-01 15:11:18 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-01 15:11:18 +0200 |
commit | e99f30e105a253ee64bef1ef83b86a47e0d3b6f1 (patch) | |
tree | 847e087ca50c1d0a02b750577b13af45aa498361 /arch/arm/include/asm/arch-keystone/hardware.h | |
parent | d6694aff569a0838a9d0ef352128f5aa309d73ff (diff) | |
parent | 12cc54376768461533b55ada1b0b6d4979f40579 (diff) | |
download | u-boot-imx-e99f30e105a253ee64bef1ef83b86a47e0d3b6f1.zip u-boot-imx-e99f30e105a253ee64bef1ef83b86a47e0d3b6f1.tar.gz u-boot-imx-e99f30e105a253ee64bef1ef83b86a47e0d3b6f1.tar.bz2 |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/include/asm/arch-keystone/hardware.h')
-rw-r--r-- | arch/arm/include/asm/arch-keystone/hardware.h | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/arch/arm/include/asm/arch-keystone/hardware.h b/arch/arm/include/asm/arch-keystone/hardware.h index 6c532ca..ffdecbf 100644 --- a/arch/arm/include/asm/arch-keystone/hardware.h +++ b/arch/arm/include/asm/arch-keystone/hardware.h @@ -22,32 +22,6 @@ typedef volatile unsigned int dv_reg; typedef volatile unsigned int *dv_reg_p; -#define ASYNC_EMIF_NUM_CS 4 -#define ASYNC_EMIF_MODE_NOR 0 -#define ASYNC_EMIF_MODE_NAND 1 -#define ASYNC_EMIF_MODE_ONENAND 2 -#define ASYNC_EMIF_PRESERVE -1 - -struct async_emif_config { - unsigned mode; - unsigned select_strobe; - unsigned extend_wait; - unsigned wr_setup; - unsigned wr_strobe; - unsigned wr_hold; - unsigned rd_setup; - unsigned rd_strobe; - unsigned rd_hold; - unsigned turn_around; - enum { - ASYNC_EMIF_8 = 0, - ASYNC_EMIF_16 = 1, - ASYNC_EMIF_32 = 2, - } width; -}; - -void init_async_emif(int num_cs, struct async_emif_config *config); - struct ddr3_phy_config { unsigned int pllcr; unsigned int pgcr1_mask; @@ -145,6 +119,10 @@ struct ddr3_emif_config { #define KS2_UART0_BASE 0x02530c00 #define KS2_UART1_BASE 0x02531000 +/* AEMIF */ +#define KS2_AEMIF_CNTRL_BASE 0x21000a00 +#define DAVINCI_ASYNC_EMIF_CNTRL_BASE KS2_AEMIF_CNTRL_BASE + #ifdef CONFIG_SOC_K2HK #include <asm/arch/hardware-k2hk.h> #endif |