mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-10-01 09:00:45 +09:00
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
This commit is contained in:
commit
c14d4b0051
@ -217,6 +217,27 @@ static void mctl_zq_calibration(struct dram_para *para)
|
||||
struct sunxi_mctl_ctl_reg * const mctl_ctl =
|
||||
(struct sunxi_mctl_ctl_reg *)SUNXI_DRAM_CTL0_BASE;
|
||||
|
||||
if ((readl(SUNXI_SRAMC_BASE + 0x24) & 0xff) == 0 &&
|
||||
(readl(SUNXI_SRAMC_BASE + 0xf0) & 0x1) == 0) {
|
||||
u32 reg_val;
|
||||
|
||||
clrsetbits_le32(&mctl_ctl->zqcr, 0xffff,
|
||||
CONFIG_DRAM_ZQ & 0xffff);
|
||||
|
||||
writel(PIR_CLRSR, &mctl_ctl->pir);
|
||||
mctl_phy_init(PIR_ZCAL);
|
||||
|
||||
reg_val = readl(&mctl_ctl->zqdr[0]);
|
||||
reg_val &= (0x1f << 16) | (0x1f << 0);
|
||||
reg_val |= reg_val << 8;
|
||||
writel(reg_val, &mctl_ctl->zqdr[0]);
|
||||
|
||||
reg_val = readl(&mctl_ctl->zqdr[1]);
|
||||
reg_val &= (0x1f << 16) | (0x1f << 0);
|
||||
reg_val |= reg_val << 8;
|
||||
writel(reg_val, &mctl_ctl->zqdr[1]);
|
||||
writel(reg_val, &mctl_ctl->zqdr[2]);
|
||||
} else {
|
||||
int i;
|
||||
u16 zq_val[6];
|
||||
u8 val;
|
||||
@ -246,6 +267,7 @@ static void mctl_zq_calibration(struct dram_para *para)
|
||||
writel((zq_val[1] << 16) | zq_val[0], &mctl_ctl->zqdr[0]);
|
||||
writel((zq_val[3] << 16) | zq_val[2], &mctl_ctl->zqdr[1]);
|
||||
writel((zq_val[5] << 16) | zq_val[4], &mctl_ctl->zqdr[2]);
|
||||
}
|
||||
}
|
||||
|
||||
static void mctl_set_cr(struct dram_para *para)
|
||||
|
@ -2,7 +2,7 @@ CONFIG_ARM=y
|
||||
CONFIG_ARCH_SUNXI=y
|
||||
CONFIG_SPL_I2C_SUPPORT=y
|
||||
CONFIG_MACH_SUN7I=y
|
||||
CONFIG_DRAM_CLK=480
|
||||
CONFIG_DRAM_CLK=384
|
||||
CONFIG_MMC0_CD_PIN="PH1"
|
||||
CONFIG_USB0_VBUS_PIN="PC17"
|
||||
CONFIG_USB0_VBUS_DET="PH5"
|
||||
|
@ -2,7 +2,7 @@ CONFIG_ARM=y
|
||||
CONFIG_ARCH_SUNXI=y
|
||||
CONFIG_SPL_I2C_SUPPORT=y
|
||||
CONFIG_MACH_SUN7I=y
|
||||
CONFIG_DRAM_CLK=480
|
||||
CONFIG_DRAM_CLK=384
|
||||
CONFIG_MMC0_CD_PIN="PH1"
|
||||
CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime"
|
||||
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
|
||||
|
Loading…
Reference in New Issue
Block a user