projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
readline(): Add ability to modify a string buffer
[oweals/u-boot.git]
/
drivers
/
i2c
/
soft_i2c.c
diff --git
a/drivers/i2c/soft_i2c.c
b/drivers/i2c/soft_i2c.c
index da6cec1fa28090bf708c25f35317d85a27771f35..59883a58f674e96d696e98de6df2e9d13b630d1f 100644
(file)
--- a/
drivers/i2c/soft_i2c.c
+++ b/
drivers/i2c/soft_i2c.c
@@
-40,7
+40,7
@@
#ifdef CONFIG_LPC2292
#include <asm/arch/hardware.h>
#endif
#ifdef CONFIG_LPC2292
#include <asm/arch/hardware.h>
#endif
-#if
def CONFIG_MPC866 /* only valid for MPC866 */
+#if
defined(CONFIG_MPC852T) || defined(CONFIG_MPC866)
#include <asm/io.h>
#endif
#include <i2c.h>
#include <asm/io.h>
#endif
#include <i2c.h>
@@
-51,14
+51,12
@@
DECLARE_GLOBAL_DATA_PTR;
#endif
DECLARE_GLOBAL_DATA_PTR;
#endif
-
/*-----------------------------------------------------------------------
* Definitions
*/
#define RETRIES 0
/*-----------------------------------------------------------------------
* Definitions
*/
#define RETRIES 0
-
#define I2C_ACK 0 /* PD_SDA level to ack a byte */
#define I2C_NOACK 1 /* PD_SDA level to noack a byte */
#define I2C_ACK 0 /* PD_SDA level to ack a byte */
#define I2C_NOACK 1 /* PD_SDA level to noack a byte */
@@
-154,7
+152,6
@@
static void send_stop(void)
I2C_TRISTATE;
}
I2C_TRISTATE;
}
-
/*-----------------------------------------------------------------------
* ack should be I2C_ACK or I2C_NOACK
*/
/*-----------------------------------------------------------------------
* ack should be I2C_ACK or I2C_NOACK
*/
@@
-174,7
+171,6
@@
static void send_ack(int ack)
I2C_DELAY;
}
I2C_DELAY;
}
-
/*-----------------------------------------------------------------------
* Send 8 bits and look for an acknowledgement.
*/
/*-----------------------------------------------------------------------
* Send 8 bits and look for an acknowledgement.
*/
@@
-246,20
+242,6
@@
int i2c_set_bus_num(unsigned int bus)
#endif
return 0;
}
#endif
return 0;
}
-
-/* TODO: add 100/400k switching */
-unsigned int i2c_get_bus_speed(void)
-{
- return CONFIG_SYS_I2C_SPEED;
-}
-
-int i2c_set_bus_speed(unsigned int speed)
-{
- if (speed != CONFIG_SYS_I2C_SPEED)
- return -1;
-
- return 0;
-}
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------