fdt: introduce fdt_create_phandle()

[karo-tx-uboot.git] / include / i2c.h

diff --git a/include/i2c.h b/include/i2c.h
index fad2d571616fcc71ff9f3dbb65b9576aaee714c9..8ceb4c852149425c91377dc2a8d56e2bfd7c6c5a 100644 (file)
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -47,7 +47,9 @@
 #define I2C_RXTX_LEN   128     /* maximum tx/rx buffer length */
 
 #if defined(CONFIG_I2C_MULTI_BUS)
+#if !defined(CONFIG_SYS_MAX_I2C_BUS)
 #define CONFIG_SYS_MAX_I2C_BUS         2
+#endif
 #define I2C_GET_BUS()          i2c_get_bus_num()
 #define I2C_SET_BUS(a)         i2c_set_bus_num(a)
 #else
@@ -72,22 +74,33 @@
 #  define I2C_SOFT_DECLARATIONS volatile ioport_t *iop = ioport_addr((immap_t *)CONFIG_SYS_IMMR, I2C_PORT);
 # elif defined(CONFIG_8xx)
 #  define I2C_SOFT_DECLARATIONS        volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
+
+# elif (defined(CONFIG_AT91RM9200) || \
+       defined(CONFIG_AT91SAM9260) ||  defined(CONFIG_AT91SAM9261) || \
+       defined(CONFIG_AT91SAM9263)) && !defined(CONFIG_AT91_LEGACY)
+#  define I2C_SOFT_DECLARATIONS        at91_pio_t *pio = (at91_pio_t *) AT91_PIO_BASE;
 # else
 #  define I2C_SOFT_DECLARATIONS
 # endif
 #endif
 
 #ifdef CONFIG_8xx
-/* Set default values for the I2C bus speed and slave address on 8xx. In the
+/* Set default value for the I2C bus speed on 8xx. In the
  * future, we'll define these in all 8xx board config files.
  */
 #ifndef        CONFIG_SYS_I2C_SPEED
 #define        CONFIG_SYS_I2C_SPEED    50000
 #endif
+#endif
 
+/*
+ * Many boards/controllers/drivers don't support an I2C slave interface so
+ * provide a default slave address for them for use in common code.  A real
+ * value for CONFIG_SYS_I2C_SLAVE should be defined for any board which does
+ * support a slave interface.
+ */
 #ifndef        CONFIG_SYS_I2C_SLAVE
-#define        CONFIG_SYS_I2C_SLAVE    0xFE
-#endif
+#define        CONFIG_SYS_I2C_SLAVE    0xfe
 #endif
 
 /*
@@ -95,8 +108,9 @@
  * repeatedly to change the speed and slave addresses.
  */
 void i2c_init(int speed, int slaveaddr);
-#ifdef CONFIG_SYS_I2C_INIT_BOARD
 void i2c_init_board(void);
+#ifdef CONFIG_SYS_I2C_BOARD_LATE_INIT
+void i2c_board_late_init(void);
 #endif
 
 #if defined(CONFIG_I2C_MUX)
@@ -114,8 +128,6 @@ typedef struct _mux_device {
        struct _mux_device      *next;
 } I2C_MUX_DEVICE;
 
-int    i2c_mux_add_device(I2C_MUX_DEVICE *dev);
-
 I2C_MUX_DEVICE *i2c_mux_search_device(int id);
 I2C_MUX_DEVICE *i2c_mux_ident_muxstring (uchar *buf);
 int i2x_mux_select_mux(int bus);
@@ -159,14 +171,7 @@ static inline u8 i2c_reg_read(u8 addr, u8 reg)
        printf("%s: addr=0x%02x, reg=0x%02x\n", __func__, addr, reg);
 #endif
 
-#ifdef CONFIG_BLACKFIN
-       /* This ifdef will become unneccessary in a future version of the
-        * blackfin I2C driver.
-        */
-       i2c_read(addr, reg, 0, &buf, 1);
-#else
        i2c_read(addr, reg, 1, &buf, 1);
-#endif
 
        return buf;
 }
@@ -183,14 +188,7 @@ static inline void i2c_reg_write(u8 addr, u8 reg, u8 val)
               __func__, addr, reg, val);
 #endif
 
-#ifdef CONFIG_BLACKFIN
-       /* This ifdef will become unneccessary in a future version of the
-        * blackfin I2C driver.
-        */
-       i2c_write(addr, reg, 0, &val, 1);
-#else
        i2c_write(addr, reg, 1, &val, 1);
-#endif
 }
 
 /*