From owner-p4-projects@FreeBSD.ORG Wed Jun 6 19:17:38 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5F5B16A46D; Wed, 6 Jun 2007 19:17:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id ACA5416A468 for ; Wed, 6 Jun 2007 19:17:37 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 93C0913C4B8 for ; Wed, 6 Jun 2007 19:17:37 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l56JHbqx019177 for ; Wed, 6 Jun 2007 19:17:37 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l56JHbhv019163 for perforce@freebsd.org; Wed, 6 Jun 2007 19:17:37 GMT (envelope-from imp@freebsd.org) Date: Wed, 6 Jun 2007 19:17:37 GMT Message-Id: <200706061917.l56JHbhv019163@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 121095 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jun 2007 19:17:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=121095 Change 121095 by imp@imp_paco-paco on 2007/06/06 19:16:58 IFC me harder... Affected files ... .. //depot/projects/arm/src/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/arm/src/sys/arm/conf/KB920X.hints#3 integrate .. //depot/projects/arm/src/sys/dev/iicbus/icee.c#10 integrate Differences ... ==== //depot/projects/arm/src/sys/arm/conf/AVILA.hints#2 (text+ko) ==== @@ -1,9 +1,31 @@ -# $FreeBSD$ +# $FreeBSD: src/sys/arm/conf/AVILA.hints,v 1.2 2007/05/29 18:10:42 jhay Exp $ # Dallas Semiconductor DS1672 RTC sitting on the I2C bus hint.ds1672.0.at="iicbus0" hint.ds1672.0.addr=0xd0 -# Analog Devices AD7418 chip sitting on the I2C bus +# DBGU is unit 0 +hint.uart.0.at="ixp0" +hint.uart.0.addr=0xc8000000 +hint.uart.0.irq=15 +hint.uart.0.flags=0x10 +# USART0 is unit 1 +hint.uart.1.at="ixp0" +hint.uart.1.addr=0xc8001000 +hint.uart.1.irq=13 + +# NPE Hardware Queue Manager +hint.ixpqmgr.0.at="ixp0" +# NPE wireless NIC's, requires ixpqmgr +hint.npe.0.at="ixp0" +hint.npe.1.at="ixp0" + +# CF IDE controller +hint.ata_avila.0.at="ixp0" + +# LED connected to gpio +hint.led_avila.0.at="ixp0" + +# Analog Devices AD7418 temperature sensor hint.ad7418.0.at="iicbus0" hint.ad7418.0.addr=0x50 ==== //depot/projects/arm/src/sys/arm/conf/KB920X.hints#3 (text+ko) ==== ==== //depot/projects/arm/src/sys/dev/iicbus/icee.c#10 (text+ko) ==== @@ -23,7 +23,8 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/dev/iicbus/icee.c,v 1.2 2007/04/17 05:48:35 imp Exp $"); + /* * Generic IIC eeprom support, modeled after the AT24C family of products. */ @@ -59,10 +60,10 @@ int wr_sz; /* What's the write page size */ }; -#define ICEE_LOCK(_sc) mtx_lock_spin(&(_sc)->sc_mtx) -#define ICEE_UNLOCK(_sc) mtx_unlock_spin(&(_sc)->sc_mtx) +#define ICEE_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) +#define ICEE_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) #define ICEE_LOCK_INIT(_sc) \ - mtx_init(&_sc->sc_mtx, device_get_nameunit(_sc->sc_dev), "icee", MTX_SPIN) + mtx_init(&_sc->sc_mtx, device_get_nameunit(_sc->sc_dev), "icee", MTX_DEF) #define ICEE_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); #define ICEE_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED); #define ICEE_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED);