diff options
| author | raj <raj@FreeBSD.org> | 2010-03-15 19:51:24 +0000 |
|---|---|---|
| committer | raj <raj@FreeBSD.org> | 2010-03-15 19:51:24 +0000 |
| commit | 426b57a40550e27c1d884e247de5a19ea2d799dd (patch) | |
| tree | 9d0f9f9a71b490eb5cdefb284a626b3332c16769 /sys/arm | |
| parent | fa367ca4a7f548046313e7ef805427fbcaf1a3aa (diff) | |
| download | FreeBSD-src-426b57a40550e27c1d884e247de5a19ea2d799dd.zip FreeBSD-src-426b57a40550e27c1d884e247de5a19ea2d799dd.tar.gz | |
MFC r204764
Provide correct TCLK value for Kirkwood A1 silicon revision.
While there improve SOC ID output accordingly.
Obtained from: Semihalf
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); |
