aboutsummaryrefslogtreecommitdiff
path: root/sys/arm
diff options
context:
space:
mode:
authorRafal Jaworowski <raj@FreeBSD.org>2010-03-15 19:51:24 +0000
committerRafal Jaworowski <raj@FreeBSD.org>2010-03-15 19:51:24 +0000
commit7bfaecdca3b15c900112399e5b55cbc176766ff0 (patch)
tree9d0f9f9a71b490eb5cdefb284a626b3332c16769 /sys/arm
parent8bf5ec104798ebef075021da4a85c65376fdf835 (diff)
Notes
Diffstat (limited to 'sys/arm')
-rw-r--r--sys/arm/mv/common.c2
-rw-r--r--sys/arm/mv/kirkwood/kirkwood.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/arm/mv/common.c b/sys/arm/mv/common.c
index d31e0819762c..a14225949c25 100644
--- a/sys/arm/mv/common.c
+++ b/sys/arm/mv/common.c
@@ -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";
diff --git a/sys/arm/mv/kirkwood/kirkwood.c b/sys/arm/mv/kirkwood/kirkwood.c
index 1be6d4580f54..cc60afe26536 100644
--- a/sys/arm/mv/kirkwood/kirkwood.c
+++ b/sys/arm/mv/kirkwood/kirkwood.c
@@ -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);