summaryrefslogtreecommitdiff
path: root/cpu/mpc83xx/i2c.c
diff options
context:
space:
mode:
authorDave Liu <daveliu@freescale.com>2006-10-25 14:41:21 -0500
committerKim Phillips <kim.phillips@freescale.com>2006-11-03 19:42:18 -0600
commitf6eda7f80ccc13d658020268c507d7173cf2e8aa (patch)
treeeb9ddcc13eab92630486bd7da53258c7cd704086 /cpu/mpc83xx/i2c.c
parent3894c46c27c64891f93ac04edde86a9fa9758d92 (diff)
downloadu-boot-imx-f6eda7f80ccc13d658020268c507d7173cf2e8aa.zip
u-boot-imx-f6eda7f80ccc13d658020268c507d7173cf2e8aa.tar.gz
u-boot-imx-f6eda7f80ccc13d658020268c507d7173cf2e8aa.tar.bz2
mpc83xx: Changed to unified mpx83xx names and added common 83xx changes
Incorporated the common unified variable names and the changes in preparation for releasing mpc8360 patches. Signed-off-by: Dave Liu <daveliu@freescale.com>
Diffstat (limited to 'cpu/mpc83xx/i2c.c')
-rw-r--r--cpu/mpc83xx/i2c.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/cpu/mpc83xx/i2c.c b/cpu/mpc83xx/i2c.c
index 70450f9..723feeb 100644
--- a/cpu/mpc83xx/i2c.c
+++ b/cpu/mpc83xx/i2c.c
@@ -1,4 +1,6 @@
/*
+ * (C) Copyright 2006 Freescale Semiconductor, Inc.
+ *
* (C) Copyright 2003,Motorola Inc.
* Xianghua Xiao <x.xiao@motorola.com>
* Adapted for Motorola 85xx chip.
@@ -31,6 +33,8 @@
*
* 20050101: Eran Liberty (liberty@freescale.com)
* Initial file creating (porting from 85XX & 8260)
+ * 20060601: Dave Liu (daveliu@freescale.com)
+ * Unified variable names for mpc83xx
*/
#include <common.h>
@@ -42,7 +46,7 @@
#include <asm/i2c.h>
#if defined(CONFIG_MPC8349EMDS) || defined(CONFIG_TQM834X)
-i2c_t * mpc8349_i2c = (i2c_t*)(CFG_IMMRBAR + CFG_I2C_OFFSET);
+i2c_t * mpc83xx_i2c = (i2c_t*)(CFG_IMMRBAR + CFG_I2C_OFFSET);
#endif
void
@@ -52,7 +56,7 @@ i2c_init(int speed, int slaveadd)
writeb(0x00 , &I2C->cr);
/* set clock */
- writeb(0x3f, &I2C->fdr);
+ writeb(speed, &I2C->fdr);
/* set default filter */
writeb(0x10,&I2C->dfsrr);