diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-01-12 00:04:01 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-01-12 00:04:01 +0100 |
| commit | 14c14db19332137ec614a01cacbed549c393423f (patch) | |
| tree | 609ff416caaf0c3e9fbac5c06439ab7463eaccd0 /cpu | |
| parent | 3709898b3ad97af72532c835796e7b2ff6dd9042 (diff) | |
| parent | 061aad4d320dddce26247699dcf2875ee2ea1366 (diff) | |
| download | u-boot-imx-14c14db19332137ec614a01cacbed549c393423f.zip u-boot-imx-14c14db19332137ec614a01cacbed549c393423f.tar.gz u-boot-imx-14c14db19332137ec614a01cacbed549c393423f.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/mpc83xx/fdt.c | 6 | ||||
| -rw-r--r-- | cpu/mpc83xx/spd_sdram.c | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/cpu/mpc83xx/fdt.c b/cpu/mpc83xx/fdt.c index f21c54e..909171f 100644 --- a/cpu/mpc83xx/fdt.c +++ b/cpu/mpc83xx/fdt.c @@ -52,6 +52,12 @@ void ft_cpu_setup(void *blob, bd_t *bd) "bus-frequency", gd->qe_clk, 1); do_fixup_by_prop_u32(blob, "device_type", "qe", 4, "brg-frequency", gd->brg_clk, 1); + do_fixup_by_compat_u32(blob, "fsl,qe", + "clock-frequency", gd->qe_clk, 1); + do_fixup_by_compat_u32(blob, "fsl,qe", + "bus-frequency", gd->qe_clk, 1); + do_fixup_by_compat_u32(blob, "fsl,qe", + "brg-frequency", gd->brg_clk, 1); #endif #ifdef CFG_NS16550 diff --git a/cpu/mpc83xx/spd_sdram.c b/cpu/mpc83xx/spd_sdram.c index 29dd470..0acca47 100644 --- a/cpu/mpc83xx/spd_sdram.c +++ b/cpu/mpc83xx/spd_sdram.c @@ -574,9 +574,9 @@ long int spd_sdram() */ cpo = 0; if (spd.mem_type == SPD_MEMTYPE_DDR2) { - if (effective_data_rate == 266 || effective_data_rate == 333) { - cpo = 0x7; /* READ_LAT + 5/4 */ - } else if (effective_data_rate == 400) { + if (effective_data_rate == 266) { + cpo = 0x4; /* READ_LAT + 1/2 */ + } else if (effective_data_rate == 333 || effective_data_rate == 400) { cpo = 0x7; /* READ_LAT + 5/4 */ } else { /* Automatic calibration */ |