Revert "ppc/p4080: Fix reporting of PME & FM clock frequencies"
authorKumar Gala <galak@kernel.crashing.org>
Mon, 25 Jan 2010 17:01:51 +0000 (11:01 -0600)
committerKumar Gala <galak@kernel.crashing.org>
Tue, 26 Jan 2010 04:13:25 +0000 (22:13 -0600)
This reverts commit bc20f9a9527afe8ae406a74f74765d4323f04922.

The original code was correct.  I clearly need glasses or a brown
paper bag.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
cpu/mpc85xx/speed.c

index 8dab8d1cf240ef1ab81d17094263cb81eb5945b9..9193992888703718557866b2132092c56545f56c 100644 (file)
@@ -103,21 +103,21 @@ void get_sys_info (sys_info_t * sysInfo)
 
 #ifdef CONFIG_SYS_DPAA_PME
        if (rcw_tmp & PME_CLK_SEL)
-               sysInfo->freqPME = sysInfo->freqSystemBus / 2;
-       else
                sysInfo->freqPME = freqCC_PLL[2] / 2;
+       else
+               sysInfo->freqPME = sysInfo->freqSystemBus / 2;
 #endif
 
 #ifdef CONFIG_SYS_DPAA_FMAN
        if (rcw_tmp & FM1_CLK_SEL)
-               sysInfo->freqFMan[0] = sysInfo->freqSystemBus / 2;
-       else
                sysInfo->freqFMan[0] = freqCC_PLL[2] / 2;
+       else
+               sysInfo->freqFMan[0] = sysInfo->freqSystemBus / 2;
 #if (CONFIG_SYS_NUM_FMAN) == 2
        if (rcw_tmp & FM2_CLK_SEL)
-               sysInfo->freqFMan[1] = sysInfo->freqSystemBus / 2;
-       else
                sysInfo->freqFMan[1] = freqCC_PLL[2] / 2;
+       else
+               sysInfo->freqFMan[1] = sysInfo->freqSystemBus / 2;
 #endif
 #endif