From owner-p4-projects@FreeBSD.ORG Thu Oct 30 04:48:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C25611065679; Thu, 30 Oct 2008 04:48:05 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 869281065670 for ; Thu, 30 Oct 2008 04:48:05 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6D2398FC1B for ; Thu, 30 Oct 2008 04:48:05 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9U4m5bi063940 for ; Thu, 30 Oct 2008 04:48:05 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9U4m5V0063938 for perforce@freebsd.org; Thu, 30 Oct 2008 04:48:05 GMT (envelope-from gonzo@FreeBSD.org) Date: Thu, 30 Oct 2008 04:48:05 GMT Message-Id: <200810300448.m9U4m5V0063938@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 152188 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Oct 2008 04:48:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=152188 Change 152188 by gonzo@gonzo_jeeves on 2008/10/30 04:47:07 Remove Sentry5 pieces Affected files ... .. //depot/projects/mips2/src/sys/mips/bcm47xx/bcm47xx_machdep.c#2 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/bcm47xx/bcm47xx_machdep.c#2 (text+ko) ==== @@ -159,8 +159,6 @@ #if defined(CFE) cfe_exit(0, 0); -#else - *((volatile uint8_t *)MIPS_PHYS_TO_KSEG1(SENTRY5_EXTIFADR)) = 0x80; #endif } @@ -203,38 +201,6 @@ #endif mips_init(); -# if 0 - /* - * Probe the Broadcom Sentry5's on-chip PLL clock registers - * and discover the CPU pipeline clock and bus clock - * multipliers from this. - * XXX: Wrong place. You have to ask the ChipCommon - * or External Interface cores on the SiBa. - */ - uint32_t busmult, cpumult, refclock, clkcfg1; -#define S5_CLKCFG1_REFCLOCK_MASK 0x0000001F -#define S5_CLKCFG1_BUSMULT_MASK 0x000003E0 -#define S5_CLKCFG1_BUSMULT_SHIFT 5 -#define S5_CLKCFG1_CPUMULT_MASK 0xFFFFFC00 -#define S5_CLKCFG1_CPUMULT_SHIFT 10 - - counter_freq = 100000000; /* XXX */ - - clkcfg1 = s5_rd_clkcfg1(); - printf("clkcfg1 = 0x%08x\n", clkcfg1); - - refclock = clkcfg1 & 0x1F; - busmult = ((clkcfg1 & 0x000003E0) >> 5) + 1; - cpumult = ((clkcfg1 & 0xFFFFFC00) >> 10) + 1; - - printf("refclock = %u\n", refclock); - printf("busmult = %u\n", busmult); - printf("cpumult = %u\n", cpumult); - - counter_freq = cpumult * refclock; -# else platform_counter_freq = 200 * 1000 * 1000; /* Sentry5 is 200MHz */ -# endif - mips_timer_init_params(platform_counter_freq, 0); }