diff options
| author | raj <raj@FreeBSD.org> | 2010-03-05 19:45:45 +0000 |
|---|---|---|
| committer | raj <raj@FreeBSD.org> | 2010-03-05 19:45:45 +0000 |
| commit | 98316db4c6cfe1324bbe79caaf6d69b82f93a925 (patch) | |
| tree | a822f306156a8a40ea7b18596a9b78b356f006ec /sys/arm | |
| parent | b84681e7ab1e7f281ae42ba334fc77a2bb5ce007 (diff) | |
| download | FreeBSD-src-98316db4c6cfe1324bbe79caaf6d69b82f93a925.zip FreeBSD-src-98316db4c6cfe1324bbe79caaf6d69b82f93a925.tar.gz | |
Provide correct TCLK value for Kirkwood A1 silicon revision.
While there improve SOC ID output accordingly.
Obtained from: Semihalf
MFC after: 1 week
Diffstat (limited to 'sys/arm')
| -rw-r--r-- | sys/arm/mv/common.c | 2 | ||||
| -rw-r--r-- | sys/arm/mv/kirkwood/kirkwood.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/arm/mv/common.c b/sys/arm/mv/common.c index d31e081..a142259 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 1be6d45..cc60afe2 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); |
