mxs: Properly setup VDDD in power supply setup code

The memory setup code adjusted the VDDD voltage. Remove this adjustment
and configure the VDDD voltage correctly in the power supply setup code.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
This commit is contained in:
Marek Vasut 2012-11-30 05:22:13 +00:00 committed by Stefano Babic
parent 77cb33bd25
commit 1230e7bc2d
2 changed files with 1 additions and 14 deletions

View file

@ -171,17 +171,6 @@ void mxs_mem_setup_vdda(void)
&power_regs->hw_power_vddactrl); &power_regs->hw_power_vddactrl);
} }
void mxs_mem_setup_vddd(void)
{
struct mxs_power_regs *power_regs =
(struct mxs_power_regs *)MXS_POWER_BASE;
writel((0x1c << POWER_VDDDCTRL_TRG_OFFSET) |
(0x7 << POWER_VDDDCTRL_BO_OFFSET_OFFSET) |
POWER_VDDDCTRL_LINREG_OFFSET_1STEPS_BELOW,
&power_regs->hw_power_vdddctrl);
}
uint32_t mxs_mem_get_size(void) uint32_t mxs_mem_get_size(void)
{ {
uint32_t sz, da; uint32_t sz, da;
@ -241,8 +230,6 @@ void mxs_mem_init(void)
while (!(readl(MXS_DRAM_BASE + 0xe8) & (1 << 20))) while (!(readl(MXS_DRAM_BASE + 0xe8) & (1 << 20)))
; ;
mxs_mem_setup_vddd();
early_delay(10000); early_delay(10000);
mxs_mem_setup_cpu_and_hbus(); mxs_mem_setup_cpu_and_hbus();

View file

@ -897,7 +897,7 @@ void mxs_power_init(void)
mxs_enable_output_rail_protection(); mxs_enable_output_rail_protection();
mxs_power_set_vddx(&mxs_vddio_cfg, 3300, 3150); mxs_power_set_vddx(&mxs_vddio_cfg, 3300, 3150);
mxs_power_set_vddx(&mxs_vddd_cfg, 1350, 1200); mxs_power_set_vddx(&mxs_vddd_cfg, 1500, 1000);
writel(POWER_CTRL_VDDD_BO_IRQ | POWER_CTRL_VDDA_BO_IRQ | writel(POWER_CTRL_VDDD_BO_IRQ | POWER_CTRL_VDDA_BO_IRQ |
POWER_CTRL_VDDIO_BO_IRQ | POWER_CTRL_VDD5V_DROOP_IRQ | POWER_CTRL_VDDIO_BO_IRQ | POWER_CTRL_VDD5V_DROOP_IRQ |