rename CFG_ macros to CONFIG_SYS

[people/ms/u-boot.git] / cpu / arm920t / at91rm9200 / i2c.c

diff --git a/cpu/arm920t/at91rm9200/i2c.c b/cpu/arm920t/at91rm9200/i2c.c
index 2565998e484d7ed0f70a1ad2ee7ce762220990dd..b68c5dd8263d77fb018b41e19bd10477c100bea5 100644 (file)
--- a/cpu/arm920t/at91rm9200/i2c.c
+++ b/cpu/arm920t/at91rm9200/i2c.c
@@ -111,7 +111,7 @@ at91_xfer(unsigned char chip, unsigned int addr, int alen,
 int
 i2c_probe(unsigned char chip)
 {
-       char buffer[1];
+       unsigned char buffer[1];
 
        return at91_xfer(chip, 0, 0, buffer, 1, 1);
 }
@@ -120,7 +120,7 @@ int
 i2c_read (unsigned char chip, unsigned int addr, int alen,
          unsigned char *buffer, int len)
 {
-#ifdef CFG_I2C_EEPROM_ADDR_OVERFLOW
+#ifdef CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW
        /* we only allow one address byte */
        if (alen > 1)
                return 1;
@@ -139,7 +139,7 @@ int
 i2c_write(unsigned char chip, unsigned int addr, int alen,
          unsigned char *buffer, int len)
 {
-#ifdef CFG_I2C_EEPROM_ADDR_OVERFLOW
+#ifdef CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW
        int i;
        unsigned char *buf;
 
@@ -191,7 +191,7 @@ i2c_init(int speed, int slaveaddr)
 
 uchar i2c_reg_read(uchar i2c_addr, uchar reg)
 {
-       char buf;
+       unsigned char buf;
 
        i2c_read(i2c_addr, reg, 1, &buf, 1);
 
@@ -203,4 +203,14 @@ void i2c_reg_write(uchar i2c_addr, uchar reg, uchar val)
        i2c_write(i2c_addr, reg, 1, &val, 1);
 }
 
+int i2c_set_bus_speed(unsigned int speed)
+{
+       return -1;
+}
+
+unsigned int i2c_get_bus_speed(void)
+{
+       return CONFIG_SYS_I2C_SPEED;
+}
+
 #endif /* CONFIG_HARD_I2C */