Date: Fri, 5 Mar 2010 19:45:46 +0000 (UTC) From: Rafal Jaworowski <raj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r204764 - in head/sys/arm/mv: . kirkwood Message-ID: <201003051945.o25Jjk7t093563@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: raj Date: Fri Mar 5 19:45:45 2010 New Revision: 204764 URL: http://svn.freebsd.org/changeset/base/204764 Log: Provide correct TCLK value for Kirkwood A1 silicon revision. While there improve SOC ID output accordingly. Obtained from: Semihalf MFC after: 1 week Modified: head/sys/arm/mv/common.c head/sys/arm/mv/kirkwood/kirkwood.c Modified: head/sys/arm/mv/common.c ============================================================================== --- head/sys/arm/mv/common.c Fri Mar 5 17:53:28 2010 (r204763) +++ head/sys/arm/mv/common.c Fri Mar 5 19:45:45 2010 (r204764) @@ -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: head/sys/arm/mv/kirkwood/kirkwood.c ============================================================================== --- head/sys/arm/mv/kirkwood/kirkwood.c Fri Mar 5 17:53:28 2010 (r204763) +++ head/sys/arm/mv/kirkwood/kirkwood.c Fri Mar 5 19:45:45 2010 (r204764) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003051945.o25Jjk7t093563>