From owner-svn-src-projects@FreeBSD.ORG Sun Dec 21 20:27:50 2008 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C87861065679; Sun, 21 Dec 2008 20:27:50 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B910C8FC18; Sun, 21 Dec 2008 20:27:50 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBLKRo7R041562; Sun, 21 Dec 2008 20:27:50 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBLKRoZg041561; Sun, 21 Dec 2008 20:27:50 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200812212027.mBLKRoZg041561@svn.freebsd.org> From: Sam Leffler Date: Sun, 21 Dec 2008 20:27:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r186379 - projects/cambria/sys/arm/xscale/ixp425 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Dec 2008 20:27:50 -0000 Author: sam Date: Sun Dec 21 20:27:50 2008 New Revision: 186379 URL: http://svn.freebsd.org/changeset/base/186379 Log: fill out feature control register defs Modified: projects/cambria/sys/arm/xscale/ixp425/ixp425reg.h Modified: projects/cambria/sys/arm/xscale/ixp425/ixp425reg.h ============================================================================== --- projects/cambria/sys/arm/xscale/ixp425/ixp425reg.h Sun Dec 21 20:27:21 2008 (r186378) +++ projects/cambria/sys/arm/xscale/ixp425/ixp425reg.h Sun Dec 21 20:27:50 2008 (r186379) @@ -397,7 +397,7 @@ #define EXP_CNFG1_SW_INT1 (1 << 1) #define EXP_FCTRL_RCOMP (1<<0) -#define EXP_FCTRL_USB (1<<1) +#define EXP_FCTRL_USB_DEVICE (1<<1) #define EXP_FCTRL_HASH (1<<2) #define EXP_FCTRL_AES (1<<3) #define EXP_FCTRL_DES (1<<4) @@ -407,11 +407,26 @@ #define EXP_FCTRL_UTOPIA (1<<8) #define EXP_FCTRL_ETH0 (1<<9) #define EXP_FCTRL_ETH1 (1<<10) -#define EXP_FCTRL_NPEA (1<<11) -#define EXP_FCTRL_NPEB (1<<12) -#define EXP_FCTRL_NPEC (1<<13) +#define EXP_FCTRL_NPEA (1<<11) /* reset */ +#define EXP_FCTRL_NPEB (1<<12) /* reset */ +#define EXP_FCTRL_NPEC (1<<13) /* reset */ #define EXP_FCTRL_PCI (1<<14) -/* XXX more stuff we don't care about */ +#define EXP_FCTRL_ECC_TIMESYNC (1<<15) +#define EXP_FCTRL_UTOPIA_PHY (3<<16) /* PHY limit */ +#define EXP_FCTRL_USB_HOST (1<<18) +#define EXP_FCTRL_NPEA_ETH (1<<19) +#define EXP_FCTRL_NPEB_ETH (1<<20) +#define EXP_FCTRL_RSA (1<<21) +#define EXP_FCTRL_MAXFREQ (3<<22) /* XScale frequency */ +#define EXP_FCTRL_RESVD (0xff<<24) + +#define EXP_FCTRL_IXP46X_ONLY \ + (EXP_FCTRL_ECC_TIMESYNC | EXP_FCTRL_USB_HOST | EXP_FCTRL_NPEA_ETH | \ + EXP_FCTRL_NPEB_ETH | EXP_FCTRL_RSA | EXP_FCTRL_MAXFREQ) + +#define EXP_FCTRL_BITS \ + "\20\1RCOMP\2USB\3HASH\4AES\5DES\6HDLC\7AAL\10HSS\11UTOPIA\12ETH0" \ + "\13ETH1\17PCI\20ECC\23USB_HOST\24NPEA_ETH\25NPEB_ETH\26RSA" /* * PCI