PERFORCE change 121095 for review

[Warner Losh]

http://perforce.freebsd.org/chv.cgi?CH=121095

Change 121095 by imp at 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 <sys/cdefs.h>
-__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);