diff options
| author | Tom Rini <trini@konsulko.com> | 2021-04-23 07:31:21 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-04-23 07:31:21 -0400 |
| commit | e8b8c2085c3eabf6b5e8764dceda02cfc2d08b2f (patch) | |
| tree | a2d2bcbe75d7c0a79bceba0363126f90c06e243f /arch/mips/mach-mtmips | |
| parent | 275a4490fd2f30df76f2aa07efa0f595fef4d46f (diff) | |
| parent | 91ce06ad340ef12fc3fd0ee3a5d040cc0bba731e (diff) | |
Merge tag 'mips-pull-2021-04-22' of https://source.denx.de/u-boot/custodians/u-boot-mips
- net: fix traffic problems in MSCC Jaguar 2 network driver
- MIPS: mt7628: fix DDR memory init
- MIPS: octeon: add MMC and USB support
Diffstat (limited to 'arch/mips/mach-mtmips')
| -rw-r--r-- | arch/mips/mach-mtmips/mt7628/ddr.c | 6 | ||||
| -rw-r--r-- | arch/mips/mach-mtmips/mt7628/init.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/arch/mips/mach-mtmips/mt7628/ddr.c b/arch/mips/mach-mtmips/mt7628/ddr.c index b091f2ecffc..4e72459906e 100644 --- a/arch/mips/mach-mtmips/mt7628/ddr.c +++ b/arch/mips/mach-mtmips/mt7628/ddr.c @@ -140,6 +140,9 @@ void mt7628_ddr_init(void) lspd = readl(sysc + SYSCTL_CLKCFG0_REG) & (CPU_PLL_FROM_BBP | CPU_PLL_FROM_XTAL); + if (pkg_type == PKG_ID_KN) + ddr_type = DRAM_DDR1; + mt7628_memc_reset(1); __udelay(200); @@ -152,9 +155,6 @@ void mt7628_ddr_init(void) param.memsize = 0; param.bus_width = 0; - if (pkg_type == PKG_ID_KN) - ddr_type = DRAM_DDR1; - if (ddr_type == DRAM_DDR1) { if (lspd) param.cfgs = ddr1_cfgs_160mhz; diff --git a/arch/mips/mach-mtmips/mt7628/init.c b/arch/mips/mach-mtmips/mt7628/init.c index 7c531ff6867..6b535129df1 100644 --- a/arch/mips/mach-mtmips/mt7628/init.c +++ b/arch/mips/mach-mtmips/mt7628/init.c @@ -68,6 +68,9 @@ int print_cpuinfo(void) val = readl(sysc + SYSCTL_EFUSE_CFG_REG); ee = val & EFUSE_MT7688; + if (pkg == PKG_ID_KN) + ddr = DRAM_DDR1; + printf("CPU: MediaTek MT%u%c ver:%u eco:%u\n", ee ? 7688 : 7628, pkg ? 'A' : 'K', ver, eco); |