PERFORCE change 111356 for review

[Warner Losh]

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

Change 111356 by imp at imp_lighthouse on 2006/12/10 02:38:29

	Move from 6-0 addressing to 7-1 addressing, like the other iic
	drivers.
	
	Submitted by:	tisco

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/at91_twireg.h#7 edit
.. //depot/projects/arm/src/sys/arm/conf/KB920X.hints#2 edit
.. //depot/projects/arm/src/sys/arm/conf/TSC4370.hints#5 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/at91/at91_twireg.h#7 (text+ko) ====

@@ -56,7 +56,7 @@
 #define TWI_MMR_IADRSZ(n) ((n) << 8)	/* Set size of transfer */
 #define TWI_MMR_MWRITE	0U		/* Master Read Direction */
 #define TWI_MMR_MREAD	(1U << 12)	/* Master Read Direction */
-#define TWI_MMR_DADR(n)	((n) << 16)	/* Device Address */
+#define TWI_MMR_DADR(n)	((n) << 15)	/* Device Address */
 
 /* TWI_CWGR */
 #define TWI_CWGR_CKDIV(x) ((x) << 16)	/* Clock Divider */

==== //depot/projects/arm/src/sys/arm/conf/KB920X.hints#2 (text+ko) ====

@@ -2,7 +2,7 @@
 # $TSC$
 # boot Eeprom
 hint.icee.0.at="iicbus0"
-hint.icee.0.addr=0x50
+hint.icee.0.addr=0xa0
 hint.icee.0.type=16
 hint.icee.0.size=16384
 hint.icee.0.rd_sz=256

==== //depot/projects/arm/src/sys/arm/conf/TSC4370.hints#5 (text+ko) ====

@@ -4,51 +4,51 @@
 hint.at45d.0.cs=0
 # ID Eeprom
 hint.icee.0.at="iicbus0"
-hint.icee.0.addr=0x40
+hint.icee.0.addr=0x80
 hint.icee.0.type=8
 hint.icee.0.size=2048
 hint.icee.0.rd_sz=256
 hint.icee.0.wr_sz=16
 # Config Eeprom
 hint.icee.1.at="iicbus0"
-hint.icee.1.addr=0x48
+hint.icee.1.addr=0x90
 hint.icee.1.type=8
 hint.icee.1.size=2048
 hint.icee.1.rd_sz=256
 hint.icee.1.wr_sz=16
 # spf eeprom
 hint.icee.2.at="iicbus0"
-hint.icee.2.addr=0x50
+hint.icee.2.addr=0xa0
 hint.icee.2.type=8
 hint.icee.2.size=128
 hint.icee.2.rd_sz=128
 hint.icee.2.wr_sz=8
-# input card ltc4305: 0x58
-# daughter card ltc4305: 0x59
+# input card ltc4305: 0xb0
+# daughter card ltc4305: 0xb1
 # ps eeprom
 hint.icee.3.at="iicbus0"
-hint.icee.3.addr=0x60
+hint.icee.3.addr=0xc0
 hint.icee.3.type=8
 hint.icee.3.size=2048
 hint.icee.3.rd_sz=256
 hint.icee.3.wr_sz=16
 # daughter ID eeprom
 hint.icee.4.at="iicbus0"
-hint.icee.4.addr=0x68
+hint.icee.4.addr=0xd0
 hint.icee.4.type=8
 hint.icee.4.size=2048
 hint.icee.4.rd_sz=256
 hint.icee.4.wr_sz=16
 # RU/GPS board ID eeprom
 hint.icee.5.at="iicbus0"
-hint.icee.5.addr=0x70
+hint.icee.5.addr=0xe0
 hint.icee.5.type=8
 hint.icee.5.size=2048
 hint.icee.5.rd_sz=256
 hint.icee.5.wr_sz=16
 # Input Card ID eeprom
 hint.icee.6.at="iicbus0"
-hint.icee.6.addr=0x78
+hint.icee.6.addr=0xf0
 hint.icee.6.type=8
 hint.icee.6.size=2048
 hint.icee.6.rd_sz=256