diff options
author | TENART Antoine <atenart@adeneo-embedded.com> | 2013-07-02 12:05:59 +0200 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-08-15 18:38:37 -0400 |
commit | dcf846d5dae75b81eccce46c577fd3957e73d474 (patch) | |
tree | a407cd99afb98ec46ce48dae285041fc986038e4 /arch/arm/cpu/armv7/am33xx/emif4.c | |
parent | 9ed6e41239e17c97d786219b5ffca4a8a118c71f (diff) | |
download | u-boot-imx-dcf846d5dae75b81eccce46c577fd3957e73d474.zip u-boot-imx-dcf846d5dae75b81eccce46c577fd3957e73d474.tar.gz u-boot-imx-dcf846d5dae75b81eccce46c577fd3957e73d474.tar.bz2 |
Add TI816X support
Signed-off-by: Antoine Tenart <atenart@adeneo-embedded.com>
[trini: Fix warnings about vtp things in emif4.c, adapt AM43XX]
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/arm/cpu/armv7/am33xx/emif4.c')
-rw-r--r-- | arch/arm/cpu/armv7/am33xx/emif4.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/am33xx/emif4.c b/arch/arm/cpu/armv7/am33xx/emif4.c index 21cefd4..59ad25c 100644 --- a/arch/arm/cpu/armv7/am33xx/emif4.c +++ b/arch/arm/cpu/armv7/am33xx/emif4.c @@ -40,9 +40,11 @@ void dram_init_banksize(void) static struct dmm_lisa_map_regs *hw_lisa_map_regs = (struct dmm_lisa_map_regs *)DMM_BASE; #endif +#ifndef CONFIG_TI816X static struct vtp_reg *vtpreg[2] = { (struct vtp_reg *)VTP0_CTRL_ADDR, (struct vtp_reg *)VTP1_CTRL_ADDR}; +#endif #ifdef CONFIG_AM33XX static struct ddr_ctrl *ddrctrl = (struct ddr_ctrl *)DDR_CTRL_ADDR; #endif @@ -64,6 +66,7 @@ void config_dmm(const struct dmm_lisa_map_regs *regs) } #endif +#ifndef CONFIG_TI816X static void config_vtp(int nr) { writel(readl(&vtpreg[nr]->vtp0ctrlreg) | VTP_CTRL_ENABLE, @@ -78,6 +81,7 @@ static void config_vtp(int nr) VTP_CTRL_READY) ; } +#endif void __weak ddr_pll_config(unsigned int ddrpll_m) { @@ -88,7 +92,9 @@ void config_ddr(unsigned int pll, unsigned int ioctrl, const struct emif_regs *regs, int nr) { ddr_pll_config(pll); +#ifndef CONFIG_TI816X config_vtp(nr); +#endif config_cmd_ctrl(ctrl, nr); config_ddr_data(data, nr); |