Merge branch 'master' of git://git.denx.de/u-boot-i2c

2010-04-08 00:15:11 +02:00 · 2010-04-08 00:15:11 +02:00 · 92abce8731
parent 6a1f7e54c2 d0b0dcaa22
commit 92abce8731
52 changed files with 50 additions and 1 deletions
--- a/cpu/ppc4xx/Makefile
+++ b/cpu/ppc4xx/Makefile
@ -52,7 +52,6 @@ COBJS	+= denali_data_eye.o
 COBJS	+= denali_spd_ddr2.o
 COBJS	+= ecc.o
 COBJS	+= fdt.o
-COBJS	+= i2c.o
 COBJS	+= interrupts.o
 COBJS	+= iop480_uart.o
 ifdef CONFIG_CMD_REGINFO
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@ -34,6 +34,7 @@ COBJS-$(CONFIG_DRIVER_OMAP1510_I2C) += omap1510_i2c.o
 COBJS-$(CONFIG_DRIVER_OMAP24XX_I2C) += omap24xx_i2c.o
 COBJS-$(CONFIG_DRIVER_OMAP34XX_I2C) += omap24xx_i2c.o
 COBJS-$(CONFIG_PCA9564_I2C) += pca9564_i2c.o
+COBJS-$(CONFIG_PPC4XX_I2C) += ppc4xx_i2c.o
 COBJS-$(CONFIG_DRIVER_S3C24X0_I2C) += s3c24x0_i2c.o
 COBJS-$(CONFIG_S3C44B0_I2C) += s3c44b0_i2c.o
 COBJS-$(CONFIG_SOFT_I2C) += soft_i2c.o
--- a/drivers/i2c/ppc4xx_i2c.c
+++ b/drivers/i2c/ppc4xx_i2c.c
--- a/include/configs/ASH405.h
+++ b/include/configs/ASH405.h
@ -244,6 +244,7 @@
 * I2C EEPROM (CAT24WC16) for environment
 */
 #define CONFIG_HARD_I2C			/* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/CANBT.h
+++ b/include/configs/CANBT.h
@ -173,6 +173,7 @@
 * I2C EEPROM (CAT24WC08) for environment
 */
 #define CONFIG_HARD_I2C			/* I2C with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/CMS700.h
+++ b/include/configs/CMS700.h
@ -224,6 +224,7 @@
 * I2C EEPROM (CAT24WC16) for environment
 */
 #define CONFIG_HARD_I2C			/* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		100000	/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/CPCI2DP.h
+++ b/include/configs/CPCI2DP.h
@ -207,6 +207,7 @@
 * I2C EEPROM (CAT24WC16) for environment
 */
 #define CONFIG_HARD_I2C			/* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/CPCI405.h
+++ b/include/configs/CPCI405.h
@ -256,6 +256,7 @@
 * I2C EEPROM (CAT24WC08) for environment
 */
 #define CONFIG_HARD_I2C			/* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/CPCI4052.h
+++ b/include/configs/CPCI4052.h
@ -283,6 +283,7 @@
 * I2C EEPROM (CAT24WC16) for environment
 */
 #define CONFIG_HARD_I2C			/* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/CPCI405AB.h
+++ b/include/configs/CPCI405AB.h
@ -259,6 +259,7 @@
 * I2C EEPROM (CAT24WC32) for environment
 */
 #define CONFIG_HARD_I2C			/* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		100000	/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/CPCI405DT.h
+++ b/include/configs/CPCI405DT.h
@ -278,6 +278,7 @@
 * I2C EEPROM (CAT24WC16) for environment
 */
 #define CONFIG_HARD_I2C			/* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/CPCIISER4.h
+++ b/include/configs/CPCIISER4.h
@ -189,6 +189,7 @@
 * I2C EEPROM (CAT24WC08) for environment
 */
 #define CONFIG_HARD_I2C			/* I2C with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/CRAYL1.h
+++ b/include/configs/CRAYL1.h
@ -65,6 +65,7 @@
 #define CONFIG_ETHADDR          00:40:a6:80:14:5
 */
 #define CONFIG_HARD_I2C         1		/* hardware support for i2c */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SDRAM_BANK0		1
 #define CONFIG_SYS_I2C_SPEED		    400000	/* I2C speed and slave address	*/
 #define CONFIG_SYS_I2C_SLAVE		    0x7F
--- a/include/configs/DP405.h
+++ b/include/configs/DP405.h
@ -174,6 +174,7 @@
 * I2C EEPROM (CAT24WC16) for environment
 */
 #define CONFIG_HARD_I2C			/* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/DU405.h
+++ b/include/configs/DU405.h
@ -212,6 +212,7 @@
 * I2C EEPROM (CAT24WC08) for environment
 */
 #define CONFIG_HARD_I2C			/* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/DU440.h
+++ b/include/configs/DU440.h
@ -169,6 +169,7 @@
 */
 #define CONFIG_HARD_I2C		1	/* I2C with hardware support    */
 #undef	CONFIG_SOFT_I2C			/* I2C bit-banged	        */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		100000	/* I2C speed and slave address  */
 #define CONFIG_SYS_I2C_SLAVE		0x7F
 #define CONFIG_I2C_MULTI_BUS    1
--- a/include/configs/ERIC.h
+++ b/include/configs/ERIC.h
@ -54,6 +54,7 @@
 #endif					/* total size of a X1240 is 2048 bytes */

 #define CONFIG_HARD_I2C		1	/* I2C with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/G2000.h
+++ b/include/configs/G2000.h
@ -295,6 +295,7 @@
 * I2C EEPROM (CAT24WC16) for environment
 */
 #define CONFIG_HARD_I2C			/* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/HH405.h
+++ b/include/configs/HH405.h
@ -331,6 +331,7 @@
 * I2C EEPROM (CAT24WC16) for environment
 */
 #define CONFIG_HARD_I2C			/* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #if 0 /* test-only */
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address */
 #else
--- a/include/configs/HUB405.h
+++ b/include/configs/HUB405.h
@ -244,6 +244,7 @@
 * I2C EEPROM (CAT24WC16) for environment
 */
 #define CONFIG_HARD_I2C			/* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/JSE.h
+++ b/include/configs/JSE.h
@ -217,6 +217,7 @@

 #define CONFIG_HARD_I2C		1	/* I2C with hardware support	*/
 #undef	CONFIG_SOFT_I2C			/* I2C bit-banged		*/
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address	*/
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/KAREF.h
+++ b/include/configs/KAREF.h
@ -132,6 +132,7 @@
 *----------------------------------------------------------------------*/
 #define CONFIG_HARD_I2C	      1		     /* I2C hardware support	*/
 #undef	CONFIG_SOFT_I2C			     /* I2C !bit-banged		*/
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED	      400000	     /* I2C speed 400kHz	*/
 #define CONFIG_SYS_I2C_SLAVE	      0x7F	     /* I2C slave address	*/
 #define CONFIG_SYS_I2C_NOPROBES      {0x69}	     /* Don't probe these addrs */
--- a/include/configs/METROBOX.h
+++ b/include/configs/METROBOX.h
@ -194,6 +194,7 @@
 *----------------------------------------------------------------------*/
 #define CONFIG_HARD_I2C	      1		     /* I2C hardware support	*/
 #undef	CONFIG_SOFT_I2C			     /* I2C !bit-banged		*/
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED	      400000	     /* I2C speed 400kHz	*/
 #define CONFIG_SYS_I2C_SLAVE	      0x7F	     /* I2C slave address	*/
 #define CONFIG_SYS_I2C_NOPROBES      {0x69}	     /* Don't probe these addrs */
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@ -97,6 +97,7 @@
 ***************************************************************/

 #define CONFIG_HARD_I2C			/* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		50000	/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/OCRTC.h
+++ b/include/configs/OCRTC.h
@ -210,6 +210,7 @@
 * I2C EEPROM (CAT24WC08) for environment
 */
 #define CONFIG_HARD_I2C			/* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/ORSG.h
+++ b/include/configs/ORSG.h
@ -208,6 +208,7 @@
 * I2C EEPROM (CAT24WC08) for environment
 */
 #define CONFIG_HARD_I2C			/* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/PCI405.h
+++ b/include/configs/PCI405.h
@ -204,6 +204,7 @@
 * I2C EEPROM (CAT24WC16) for environment
 */
 #define CONFIG_HARD_I2C			/* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@ -86,6 +86,7 @@
 * The Atmel EEPROM uses 16Bit addressing.
 ***************************************************************/
 #define CONFIG_HARD_I2C			/* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		50000	/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/PLU405.h
+++ b/include/configs/PLU405.h
@ -278,6 +278,7 @@
 * I2C EEPROM (24WC16) for environment
 */
 #define CONFIG_HARD_I2C			/* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/PMC405.h
+++ b/include/configs/PMC405.h
@ -235,6 +235,7 @@
 * I2C EEPROM (CAT24WC16) for environment
 */
 #define CONFIG_HARD_I2C			/* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		100000 /* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/PMC405DE.h
+++ b/include/configs/PMC405DE.h
@ -215,6 +215,7 @@
 * I2C EEPROM (24W16) for environment
 */
 #define CONFIG_HARD_I2C			/* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000 /* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@ -226,6 +226,7 @@
 *----------------------------------------------------------------------*/
 #define CONFIG_HARD_I2C		1	/* I2C with hardware support    */
 #undef	CONFIG_SOFT_I2C		/* I2C bit-banged               */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address  */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/PPChameleonEVB.h
+++ b/include/configs/PPChameleonEVB.h
@ -414,6 +414,7 @@
 * I2C EEPROM (CAT24WC16) for environment
 */
 #define CONFIG_HARD_I2C			/* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/VOH405.h
+++ b/include/configs/VOH405.h
@ -277,6 +277,7 @@
 * I2C EEPROM (CAT24WC16) for environment
 */
 #define CONFIG_HARD_I2C			/* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		100000	/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/VOM405.h
+++ b/include/configs/VOM405.h
@ -203,6 +203,7 @@
 * I2C EEPROM (CAT24WC16) for environment
 */
 #define CONFIG_HARD_I2C			/* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/W7OLMC.h
+++ b/include/configs/W7OLMC.h
@ -273,6 +273,7 @@
 * I2C EEPROM (CAT24WC08) for environment
 */
 #define CONFIG_HARD_I2C			/* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/W7OLMG.h
+++ b/include/configs/W7OLMG.h
@ -280,6 +280,7 @@
 * I2C EEPROM (ATMEL 24C04N)
 */
 #define CONFIG_HARD_I2C		1		/* Hardware assisted I2C	*/
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000		/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/WUH405.h
+++ b/include/configs/WUH405.h
@ -241,6 +241,7 @@
 * I2C EEPROM (CAT24WC16) for environment
 */
 #define CONFIG_HARD_I2C			/* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/XPEDITE1000.h
+++ b/include/configs/XPEDITE1000.h
@ -141,6 +141,7 @@ extern void out32(unsigned int, unsigned long);
 * I2C
 */
 #define CONFIG_HARD_I2C			1	/* I2C with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7f
 #define CONFIG_I2C_MULTI_BUS
--- a/include/configs/alpr.h
+++ b/include/configs/alpr.h
@ -118,6 +118,7 @@
 *----------------------------------------------------------------------*/
 #define CONFIG_HARD_I2C		1	/* I2C with hardware support	*/
 #undef	CONFIG_SOFT_I2C			/* I2C bit-banged		*/
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		100000	/* I2C speed and slave address	*/
 #define CONFIG_SYS_I2C_SLAVE		0x7F
 #define CONFIG_SYS_I2C_NOPROBES	{0x69}	/* Don't probe these addrs	*/
--- a/include/configs/amcc-common.h
+++ b/include/configs/amcc-common.h
@ -40,6 +40,7 @@
 * I2C
 */
 #define CONFIG_HARD_I2C			/* I2C with hardware support	*/
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SLAVE		0x7F

 /*
--- a/include/configs/csb272.h
+++ b/include/configs/csb272.h
@ -171,6 +171,7 @@
 *
 */
 #define CONFIG_HARD_I2C		1	/* I2C with hardware support	*/
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		100000	/* I2C speed			*/
 #define CONFIG_SYS_I2C_SLAVE		0x7F	/* I2C slave address		*/

--- a/include/configs/csb472.h
+++ b/include/configs/csb472.h
@ -170,6 +170,7 @@
 *
 */
 #define CONFIG_HARD_I2C		1	/* I2C with hardware support	*/
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		100000	/* I2C speed			*/
 #define CONFIG_SYS_I2C_SLAVE		0x7F	/* I2C slave address		*/

--- a/include/configs/korat.h
+++ b/include/configs/korat.h
@ -153,6 +153,7 @@
 */
 #define CONFIG_HARD_I2C		1	/* I2C with hardware support	*/
 #undef	CONFIG_SOFT_I2C			/* I2C bit-banged		*/
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address	*/
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@ -258,6 +258,7 @@
 *----------------------------------------------------------------------*/
 #define CONFIG_HARD_I2C		1		/* I2C with hardware support	*/
 #undef	CONFIG_SOFT_I2C				/* I2C bit-banged		*/
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		100000		/* I2C speed and slave address	*/
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/netstal-common.h
+++ b/include/configs/netstal-common.h
@ -42,6 +42,7 @@
 * I2C
 */
 #define CONFIG_HARD_I2C		1	/* I2C with hardware support */
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address	*/
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/p3p440.h
+++ b/include/configs/p3p440.h
@ -92,6 +92,7 @@
 *----------------------------------------------------------------------*/
 #define CONFIG_HARD_I2C		1	/* I2C with hardware support	*/
 #undef	CONFIG_SOFT_I2C			/* I2C bit-banged		*/
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		100000	/* I2C speed and slave address	*/
 #define CONFIG_SYS_I2C_SLAVE		0x7F
 #define CONFIG_SYS_I2C_NOPROBES	{0x69}	/* Don't probe these addrs	*/
--- a/include/configs/pcs440ep.h
+++ b/include/configs/pcs440ep.h
@ -138,6 +138,7 @@
 *----------------------------------------------------------------------*/
 #define CONFIG_HARD_I2C		1	    /* I2C with hardware support	*/
 #undef	CONFIG_SOFT_I2C			    /* I2C bit-banged		*/
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		100000	/* I2C speed and slave address	*/
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/quad100hd.h
+++ b/include/configs/quad100hd.h
@ -150,6 +150,7 @@
 *----------------------------------------------------------------------*/
 #define CONFIG_HARD_I2C		1		/* I2C with hardware support	*/
 #undef	CONFIG_SOFT_I2C				/* I2C bit-banged		*/
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000		/* I2C speed and slave address	*/
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/sbc405.h
+++ b/include/configs/sbc405.h
@ -166,6 +166,7 @@

 #define CONFIG_HARD_I2C		1	/* I2C with hardware support	*/
 #undef  CONFIG_SOFT_I2C			/* I2C bit-banged		*/
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address	*/
 #define CONFIG_SYS_I2C_SLAVE		0x7F

--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@ -251,6 +251,7 @@
 */
 #define  CONFIG_HARD_I2C		/* I2C with hardware support	*/
 #undef	CONFIG_SOFT_I2C			/* I2C bit-banged		*/
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/

 #define I2C_INIT
 #define I2C_ACTIVE 0
--- a/include/configs/zeus.h
+++ b/include/configs/zeus.h
@ -167,6 +167,7 @@
 *----------------------------------------------------------------------*/
 #define CONFIG_HARD_I2C		1		/* I2C with hardware support	*/
 #undef	CONFIG_SOFT_I2C				/* I2C bit-banged		*/
+#define CONFIG_PPC4XX_I2C		/* use PPC4xx driver		*/
 #define CONFIG_SYS_I2C_SPEED		400000		/* I2C speed and slave address	*/
 #define CONFIG_SYS_I2C_SLAVE		0x7F