diff options
author | Timur Tabi <timur@freescale.com> | 2006-11-03 19:15:00 -0600 |
---|---|---|
committer | Kim Phillips <kim.phillips@freescale.com> | 2006-11-03 19:42:23 -0600 |
commit | be5e61815d5a1fac290ce9c0ef09cb6a8e4288fa (patch) | |
tree | ff1cf5e25e26fe920ce38719572094de10a36e62 /board/mpc8360emds/pci.c | |
parent | d239d74b1c937984bc519083a8e7de373a390f06 (diff) | |
download | u-boot-imx-be5e61815d5a1fac290ce9c0ef09cb6a8e4288fa.zip u-boot-imx-be5e61815d5a1fac290ce9c0ef09cb6a8e4288fa.tar.gz u-boot-imx-be5e61815d5a1fac290ce9c0ef09cb6a8e4288fa.tar.bz2 |
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>
Diffstat (limited to 'board/mpc8360emds/pci.c')
-rw-r--r-- | board/mpc8360emds/pci.c | 13 |
1 files changed, 3 insertions, 10 deletions
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 @@ void pci_init_board(void) /* 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 @@ void pci_init_board(void) 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 |