Author: raj
Date: Mon Mar 15 19:51:24 2010
New Revision: 205192
URL: http://svn.freebsd.org/changeset/base/205192
Log:
MFC r204764
Provide correct TCLK value for Kirkwood A1 silicon revision.
While there improve SOC ID output accordingly.
Obtained from: Semihalf
Modified:
stable/8/sys/arm/mv/common.c
stable/8/sys/arm/mv/kirkwood/kirkwood.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/arm/mv/common.c
==============================================================================
--- stable/8/sys/arm/mv/common.c Mon Mar 15 19:13:52 2010
(r205191)
+++ stable/8/sys/arm/mv/common.c Mon Mar 15 19:51:24 2010
(r205192)
@@ -261,6 +261,8 @@ soc_identify(void)
rev = "Z0";
else if (r == 2)
rev = "A0";
+ else if (r == 3)
+ rev = "A1";
break;
case MV_DEV_MV78100_Z0:
dev = "Marvell MV78100 Z0";
Modified: stable/8/sys/arm/mv/kirkwood/kirkwood.c
==============================================================================
--- stable/8/sys/arm/mv/kirkwood/kirkwood.c Mon Mar 15 19:13:52 2010
(r205191)
+++ stable/8/sys/arm/mv/kirkwood/kirkwood.c Mon Mar 15 19:51:24 2010
(r205192)
@@ -176,11 +176,11 @@ get_tclk(void)
/*
* On Kirkwood TCLK is not configurable and depends on silicon
* revision:
- * - A0 has TCLK hardcoded to 200 MHz.
+ * - A0 and A1 have TCLK hardcoded to 200 MHz.
* - Z0 and others have TCLK hardcoded to 166 MHz.
*/
soc_id(&dev, &rev);
- if (dev == MV_DEV_88F6281 && rev == 2)
+ if (dev == MV_DEV_88F6281 && (rev == 2 || rev == 3))
return (TCLK_200MHZ);
return (TCLK_166MHZ);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
