ppc/85xx: Simplify the top makefile for 36-bit config for MPC8572DS

[oweals/u-boot.git] / cpu / mpc8260 / i2c.c

diff --git a/cpu/mpc8260/i2c.c b/cpu/mpc8260/i2c.c
index a93419396fe6c49b8d66fab69ed4569bcad90444..d2bdcc2d827f99e1560a334f996a9f1f860c79ba 100644 (file)
--- a/cpu/mpc8260/i2c.c
+++ b/cpu/mpc8260/i2c.c
@@ -37,7 +37,7 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 #if defined(CONFIG_I2C_MULTI_BUS)
-static unsigned int i2c_bus_num __attribute__ ((section ("data"))) = 0;
+static unsigned int i2c_bus_num __attribute__ ((section (".data"))) = 0;
 #endif /* CONFIG_I2C_MULTI_BUS */
 
 /* uSec to wait between polls of the i2c */
@@ -58,9 +58,6 @@ static unsigned int i2c_bus_num __attribute__ ((section ("data"))) = 0;
 #define        CONFIG_SYS_I2C_SPEED    50000
 #endif
 
-#ifndef        CONFIG_SYS_I2C_SLAVE
-#define        CONFIG_SYS_I2C_SLAVE    0xFE
-#endif
 /*-----------------------------------------------------------------------
  */
 
@@ -753,22 +750,6 @@ i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len)
        return 0;
 }
 
-uchar
-i2c_reg_read(uchar chip, uchar reg)
-{
-       uchar buf;
-
-       i2c_read(chip, reg, 1, &buf, 1);
-
-       return (buf);
-}
-
-void
-i2c_reg_write(uchar chip, uchar reg, uchar val)
-{
-       i2c_write(chip, reg, 1, &val, 1);
-}
-
 #if defined(CONFIG_I2C_MULTI_BUS)
 /*
  * Functions for multiple I2C bus handling
@@ -799,19 +780,6 @@ int i2c_set_bus_num(unsigned int bus)
 #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 /* CONFIG_I2C_MULTI_BUS */
 #endif /* CONFIG_HARD_I2C */