[PATCH 2/3] OMAP4460: ram init changes
Jean-Christophe PLAGNIOL-VILLARD
plagnioj at jcrosoft.com
Fri Jul 27 10:13:46 EDT 2012
On 15:40 Fri 27 Jul , Jan Weitzel wrote:
> configure Memory Adapter for 4460
>
> Signed-off-by: Jan Weitzel <j.weitzel at phytec.de>
> ---
> arch/arm/mach-omap/include/mach/omap4-silicon.h | 4 ++++
> arch/arm/mach-omap/omap4_generic.c | 21 +++++++++++++++++++--
> 2 files changed, 23 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap/include/mach/omap4-silicon.h b/arch/arm/mach-omap/include/mach/omap4-silicon.h
> index d5517c5..4082bac 100644
> --- a/arch/arm/mach-omap/include/mach/omap4-silicon.h
> +++ b/arch/arm/mach-omap/include/mach/omap4-silicon.h
> @@ -101,6 +101,10 @@
> #define DMM_LISA_MAP_SYS_SIZE_MASK (7 << 20)
> #define DMM_LISA_MAP_SYS_SIZE_SHIFT 20
> #define DMM_LISA_MAP_SYS_ADDR_MASK (0xFF << 24)
> +
> +/* Memory Adapter (4460 onwards) */
> +#define OMAP44XX_MA_BASE 0x482AF000
> +
> /*
> * Hardware Register Details
> */
> diff --git a/arch/arm/mach-omap/omap4_generic.c b/arch/arm/mach-omap/omap4_generic.c
> index 07aa2b4..a368759 100644
> --- a/arch/arm/mach-omap/omap4_generic.c
> +++ b/arch/arm/mach-omap/omap4_generic.c
> @@ -29,6 +29,10 @@
> #define OMAP4460_CONTROL_ID_CODE_ES1_0 0x0B94E02F
> #define OMAP4460_CONTROL_ID_CODE_ES1_1 0x2B94E02F
>
> +/* EMIF_L3_CONFIG register value */
> +#define EMIF_L3_CONFIG_VAL_SYS_10_LL_0 0x0A0000FF
> +#define EMIF_L3_CONFIG_VAL_SYS_10_MPU_3_LL_0 0x0A300000
> +
> void __noreturn reset_cpu(unsigned long addr)
> {
> writel(PRM_RSTCTRL_RESET, PRM_RSTCTRL);
> @@ -270,8 +274,7 @@ static void reset_phy(unsigned int base)
> void omap4_ddr_init(const struct ddr_regs *ddr_regs,
> const struct dpll_param *core)
> {
> - unsigned int rev;
> - rev = omap4_revision();
> + unsigned int rev = omap4_revision();
>
> if (rev == OMAP4430_ES2_0) {
> writel(0x9e9e9e9e, 0x4A100638);
> @@ -294,6 +297,13 @@ void omap4_ddr_init(const struct ddr_regs *ddr_regs,
> *(volatile int*)(OMAP44XX_DMM_BASE + DMM_LISA_MAP_2) = 0x00000000;
> *(volatile int*)(OMAP44XX_DMM_BASE + DMM_LISA_MAP_3) = 0xFF020100;
>
> + if (rev >= OMAP4460_ES1_0) {
> + writel(0x80640300, OMAP44XX_MA_BASE + DMM_LISA_MAP_0);
> +
> + *(volatile int*)(OMAP44XX_MA_BASE + DMM_LISA_MAP_2) = 0x00000000;
> + *(volatile int*)(OMAP44XX_MA_BASE + DMM_LISA_MAP_3) = 0xFF020100;
??
Best Regards,
J.
More information about the barebox
mailing list