mpc83xx: Update 83xx to use fsl_i2c.c
Update the 83xx tree to use I2C support in drivers/fsl_i2c.c. Delete
cpu/mpc83xx/i2c.c, include/asm-ppc/i2c.h, and all references to those files.
Added multiple I2C bus support to fsl_i2c.c.
Signed-off-by: Timur Tabi <timur@freescale.com>
diff --git a/board/mpc8360emds/pci.c b/board/mpc8360emds/pci.c
index a013ba3..15a48dc 100644
--- a/board/mpc8360emds/pci.c
+++ b/board/mpc8360emds/pci.c
@@ -19,7 +19,7 @@
#include <pci.h>
#include <i2c.h>
-#include <asm/i2c.h>
+#include <asm/fsl_i2c.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -200,9 +200,7 @@
/* Switch temporarily to I2C bus #2 */
orig_i2c_bus = i2c_get_bus_num();
-
- if(orig_i2c_bus != 2)
- i2c_set_bus_num(2);
+ i2c_set_bus_num(1);
val8 = 0;
i2c_write(0x23, 0x6, 1, &val8, 1);
@@ -231,12 +229,7 @@
asm("eieio");
/* Reset to original I2C bus */
- if(orig_i2c_bus != 2)
- i2c_set_bus_num(orig_i2c_bus);
-
- /* Reset to original I2C bus */
- if(orig_i2c_bus != 2)
- i2c_set_bus_num(orig_i2c_bus);
+ i2c_set_bus_num(orig_i2c_bus);
/*
* Release PCI RST Output signal