diff options
| author | Tom Rini <trini@konsulko.com> | 2017-02-03 20:33:42 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-02-03 20:33:42 -0500 |
| commit | c83a824e62277162ad35f52879b2316902c0eff5 (patch) | |
| tree | fa91cdcda24b8822d0f1e52786b2657e4d68be27 /arch/powerpc/cpu/mpc86xx/speed.c | |
| parent | 0ff27d4a94637d4b1937c625d33212375bd118d9 (diff) | |
| parent | add63f94a9c3bbe1af3fdf3f4c56a5185a4c0504 (diff) | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
configs/ls1046aqds_defconfig
configs/ls1046aqds_nand_defconfig
configs/ls1046aqds_qspi_defconfig
configs/ls1046aqds_sdcard_ifc_defconfig
configs/ls1046aqds_sdcard_qspi_defconfig
configs/ls1046ardb_emmc_defconfig
configs/ls1046ardb_qspi_defconfig
configs/ls1046ardb_sdcard_defconfig
Diffstat (limited to 'arch/powerpc/cpu/mpc86xx/speed.c')
| -rw-r--r-- | arch/powerpc/cpu/mpc86xx/speed.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/arch/powerpc/cpu/mpc86xx/speed.c b/arch/powerpc/cpu/mpc86xx/speed.c index 05f23db457..51b47b823b 100644 --- a/arch/powerpc/cpu/mpc86xx/speed.c +++ b/arch/powerpc/cpu/mpc86xx/speed.c @@ -24,7 +24,6 @@ void get_sys_info(sys_info_t *sys_info) volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR; volatile ccsr_gur_t *gur = &immap->im_gur; uint plat_ratio, e600_ratio; - uint lcrr_div; plat_ratio = (gur->porpllsr) & 0x0000003e; plat_ratio >>= 1; @@ -78,19 +77,7 @@ void get_sys_info(sys_info_t *sys_info) break; } -#if defined(CONFIG_SYS_LBC_LCRR) - /* We will program LCRR to this value later */ - lcrr_div = CONFIG_SYS_LBC_LCRR & LCRR_CLKDIV; -#else - lcrr_div = in_be32(&immap->im_lbc.lcrr) & LCRR_CLKDIV; -#endif - if (lcrr_div == 2 || lcrr_div == 4 || lcrr_div == 8) { - sys_info->freq_localbus = sys_info->freq_systembus - / (lcrr_div * 2); - } else { - /* In case anyone cares what the unknown value is */ - sys_info->freq_localbus = lcrr_div; - } + sys_info->freq_localbus = sys_info->freq_systembus; } |