]> err.no Git - linux-2.6/commitdiff
[MIPS] Alchemy: Remove code wrapped by dead symbol CONFIG_AU1000_USE32K
authorRalf Baechle <ralf@linux-mips.org>
Fri, 13 Jul 2007 05:42:36 +0000 (06:42 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Fri, 13 Jul 2007 16:40:00 +0000 (17:40 +0100)
Noticed by Robert P. J. Day (rpjday@mindspring.com).

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/au1000/common/time.c

index fa1c62f055156a509e2b6e5aeed75f0d7b67fa70..1dba3f7ade823071ef22c361c7b21d937b66e881 100644 (file)
@@ -247,33 +247,8 @@ unsigned long cal_r4koff(void)
                au_writel (0, SYS_TOYWRITE);
                while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C1S);
 
-#if defined(CONFIG_AU1000_USE32K)
-               {
-                       unsigned long start, end, count;
-
-                       start = au_readl(SYS_RTCREAD);
-                       start += 2;
-                       /* wait for the beginning of a new tick
-                       */
-                       while (au_readl(SYS_RTCREAD) < start);
-
-                       /* Start r4k counter.
-                       */
-                       write_c0_count(0);
-
-                       /* Wait 0.5 seconds.
-                       */
-                       end = start + (32768 / trim_divide)/2;
-
-                       while (end > au_readl(SYS_RTCREAD));
-
-                       count = read_c0_count();
-                       cpu_speed = count * 2;
-               }
-#else
                cpu_speed = (au_readl(SYS_CPUPLL) & 0x0000003f) *
                        AU1000_SRC_CLK;
-#endif
        }
        else {
                /* The 32KHz oscillator isn't running, so assume there