i2c, soft-i2c: switch to new multibus/multiadapter support

[J-u-boot.git] / drivers / i2c / soft_i2c.c

diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c
index 9a4878391674e924f9e3c1144392249cebd76984..12693041d7fe6d0f86fe718a1dcb8b156043b535 100644 (file)
--- a/drivers/i2c/soft_i2c.c
+++ b/drivers/i2c/soft_i2c.c
@@ -1,4 +1,8 @@
 /*
 /*

+ * (C) Copyright 2009
+ * Heiko Schocher, DENX Software Engineering, [email protected].
+ * Changes for multibus/multiadapter I2C support.
+ *

  * (C) Copyright 2001, 2002
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  *
  * (C) Copyright 2001, 2002
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  *


@@ -30,36 +34,103 @@
 #include <ioports.h>
 #include <asm/io.h>
 #endif
 #include <ioports.h>
 #include <asm/io.h>
 #endif

-#ifdef CONFIG_AT91RM9200               /* need this for the at91rm9200 */
+#if defined(CONFIG_AVR32)
+#include <asm/arch/portmux.h>
+#endif
+#if defined(CONFIG_AT91FAMILY)

 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>

-#endif
-#ifdef CONFIG_AT91SAM9263              /* only valid for AT91SAM9263 */
-#include <asm/arch/at91_pmc.h>
+#include <asm/arch/at91_pio.h>
+#ifdef CONFIG_AT91_LEGACY

 #include <asm/arch/gpio.h>
 #include <asm/arch/gpio.h>

-#include <asm/arch/io.h>
+#endif

 #endif
 #ifdef CONFIG_IXP425                   /* only valid for IXP425 */
 #include <asm/arch/ixp425.h>
 #endif
 #endif
 #ifdef CONFIG_IXP425                   /* only valid for IXP425 */
 #include <asm/arch/ixp425.h>
 #endif

-#ifdef CONFIG_LPC2292
-#include <asm/arch/hardware.h>
-#endif

 #if defined(CONFIG_MPC852T) || defined(CONFIG_MPC866)
 #include <asm/io.h>
 #endif
 #include <i2c.h>
 
 #if defined(CONFIG_MPC852T) || defined(CONFIG_MPC866)
 #include <asm/io.h>
 #endif
 #include <i2c.h>
 

+#if defined(CONFIG_SOFT_I2C_GPIO_SCL)
+# include <asm/gpio.h>
+
+# ifndef I2C_GPIO_SYNC
+#  define I2C_GPIO_SYNC
+# endif
+
+# ifndef I2C_INIT
+#  define I2C_INIT \
+       do { \
+               gpio_request(CONFIG_SOFT_I2C_GPIO_SCL, "soft_i2c"); \
+               gpio_request(CONFIG_SOFT_I2C_GPIO_SDA, "soft_i2c"); \
+       } while (0)
+# endif
+
+# ifndef I2C_ACTIVE
+#  define I2C_ACTIVE do { } while (0)
+# endif
+
+# ifndef I2C_TRISTATE
+#  define I2C_TRISTATE do { } while (0)
+# endif
+
+# ifndef I2C_READ
+#  define I2C_READ gpio_get_value(CONFIG_SOFT_I2C_GPIO_SDA)
+# endif
+
+# ifndef I2C_SDA
+#  define I2C_SDA(bit) \
+       do { \
+               if (bit) \
+                       gpio_direction_input(CONFIG_SOFT_I2C_GPIO_SDA); \
+               else \
+                       gpio_direction_output(CONFIG_SOFT_I2C_GPIO_SDA, 0); \
+               I2C_GPIO_SYNC; \
+       } while (0)
+# endif
+
+# ifndef I2C_SCL
+#  define I2C_SCL(bit) \
+       do { \
+               gpio_direction_output(CONFIG_SOFT_I2C_GPIO_SCL, bit); \
+               I2C_GPIO_SYNC; \
+       } while (0)
+# endif
+
+# ifndef I2C_DELAY
+#  define I2C_DELAY udelay(5)  /* 1/4 I2C clock duration */
+# endif
+
+#endif
+

 /* #define     DEBUG_I2C       */
 
 /* #define     DEBUG_I2C       */
 

-#ifdef DEBUG_I2C

 DECLARE_GLOBAL_DATA_PTR;
 DECLARE_GLOBAL_DATA_PTR;

+
+#ifndef        I2C_SOFT_DECLARATIONS
+# if defined(CONFIG_MPC8260)
+#  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;
+# else
+#  define I2C_SOFT_DECLARATIONS
+# endif
+#endif
+
+#if !defined(CONFIG_SYS_SOFT_I2C_SPEED)
+#define CONFIG_SYS_SOFT_I2C_SPEED CONFIG_SYS_I2C_SPEED
+#endif
+#if !defined(CONFIG_SYS_SOFT_I2C_SLAVE)
+#define CONFIG_SYS_SOFT_I2C_SLAVE CONFIG_SYS_I2C_SLAVE

 #endif
 
 /*-----------------------------------------------------------------------
  * Definitions
  */
 #endif
 
 /*-----------------------------------------------------------------------
  * Definitions
  */

-

 #define RETRIES                0
 
 #define I2C_ACK                0               /* PD_SDA level to ack a byte */
 #define RETRIES                0
 
 #define I2C_ACK                0               /* PD_SDA level to ack a byte */


@@ -68,17 +139,12 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef DEBUG_I2C
 #define PRINTD(fmt,args...)    do {    \
 
 #ifdef DEBUG_I2C
 #define PRINTD(fmt,args...)    do {    \

-       if (gd->have_console)           \

                printf (fmt ,##args);   \
        } while (0)
 #else
 #define PRINTD(fmt,args...)
 #endif
 
                printf (fmt ,##args);   \
        } while (0)
 #else
 #define PRINTD(fmt,args...)
 #endif
 

-#if defined(CONFIG_I2C_MULTI_BUS)
-static unsigned int i2c_bus_num __attribute__ ((section (".data"))) = 0;
-#endif /* CONFIG_I2C_MULTI_BUS */
-

 /*-----------------------------------------------------------------------
  * Local functions
  */
 /*-----------------------------------------------------------------------
  * Local functions
  */


@@ -217,38 +283,6 @@ static int write_byte(uchar data)
        return(nack);   /* not a nack is an ack */
 }
 
        return(nack);   /* not a nack is an ack */
 }
 

-#if defined(CONFIG_I2C_MULTI_BUS)
-/*
- * Functions for multiple I2C bus handling
- */
-unsigned int i2c_get_bus_num(void)
-{
-       return i2c_bus_num;
-}
-
-int i2c_set_bus_num(unsigned int bus)
-{
-#if defined(CONFIG_I2C_MUX)
-       if (bus < CONFIG_SYS_MAX_I2C_BUS) {
-               i2c_bus_num = bus;
-       } else {
-               int     ret;
-
-               ret = i2x_mux_select_mux(bus);
-               if (ret == 0)
-                       i2c_bus_num = bus;
-               else
-                       return ret;
-       }
-#else
-       if (bus >= CONFIG_SYS_MAX_I2C_BUS)
-               return -1;
-       i2c_bus_num = bus;
-#endif
-       return 0;
-}
-#endif
-

 /*-----------------------------------------------------------------------
  * if ack == I2C_ACK, ACK the byte so can continue reading, else
  * send I2C_NOACK to end the read.
 /*-----------------------------------------------------------------------
  * if ack == I2C_ACK, ACK the byte so can continue reading, else
  * send I2C_NOACK to end the read.


@@ -279,14 +313,10 @@ static uchar read_byte(int ack)
        return(data);
 }
 
        return(data);
 }
 

-/*=====================================================================*/
-/*                         Public Functions                            */
-/*=====================================================================*/
-

 /*-----------------------------------------------------------------------
  * Initialization
  */
 /*-----------------------------------------------------------------------
  * Initialization
  */

-void i2c_init (int speed, int slaveaddr)
+static void soft_i2c_init(struct i2c_adapter *adap, int speed, int slaveaddr)

 {
 #if defined(CONFIG_SYS_I2C_INIT_BOARD)
        /* call board specific i2c bus reset routine before accessing the   */
 {
 #if defined(CONFIG_SYS_I2C_INIT_BOARD)
        /* call board specific i2c bus reset routine before accessing the   */


@@ -309,7 +339,7 @@ void i2c_init (int speed, int slaveaddr)
  * completion of EEPROM writes since the chip stops responding until
  * the write completes (typically 10mSec).
  */
  * completion of EEPROM writes since the chip stops responding until
  * the write completes (typically 10mSec).
  */

-int i2c_probe(uchar addr)
+static int soft_i2c_probe(struct i2c_adapter *adap, uint8_t addr)

 {
        int rc;
 
 {
        int rc;
 


@@ -327,7 +357,8 @@ int i2c_probe(uchar addr)
 /*-----------------------------------------------------------------------
  * Read bytes
  */
 /*-----------------------------------------------------------------------
  * Read bytes
  */

-int  i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len)
+static int  soft_i2c_read(struct i2c_adapter *adap, uchar chip, uint addr,
+                       int alen, uchar *buffer, int len)

 {
        int shift;
        PRINTD("i2c_read: chip %02X addr %02X alen %d buffer %p len %d\n",
 {
        int shift;
        PRINTD("i2c_read: chip %02X addr %02X alen %d buffer %p len %d\n",


@@ -401,7 +432,8 @@ int  i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len)
 /*-----------------------------------------------------------------------
  * Write bytes
  */
 /*-----------------------------------------------------------------------
  * Write bytes
  */

-int  i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len)
+static int  soft_i2c_write(struct i2c_adapter *adap, uchar chip, uint addr,
+                       int alen, uchar *buffer, int len)

 {
        int shift, failures = 0;
 
 {
        int shift, failures = 0;
 


@@ -431,3 +463,32 @@ int  i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len)
        send_stop();
        return(failures);
 }
        send_stop();
        return(failures);
 }

+
+/*
+ * Register soft i2c adapters
+ */
+U_BOOT_I2C_ADAP_COMPLETE(soft0, soft_i2c_init, soft_i2c_probe,
+                        soft_i2c_read, soft_i2c_write, NULL,
+                        CONFIG_SYS_I2C_SOFT_SPEED, CONFIG_SYS_I2C_SOFT_SLAVE,
+                        0)
+#if defined(I2C_SOFT_DECLARATIONS2)
+U_BOOT_I2C_ADAP_COMPLETE(soft1, soft_i2c_init, soft_i2c_probe,
+                        soft_i2c_read, soft_i2c_write, NULL,
+                        CONFIG_SYS_I2C_SOFT_SPEED_2,
+                        CONFIG_SYS_I2C_SOFT_SLAVE_2,
+                        1)
+#endif
+#if defined(I2C_SOFT_DECLARATIONS3)
+U_BOOT_I2C_ADAP_COMPLETE(soft2, soft_i2c_init, soft_i2c_probe,
+                        soft_i2c_read, soft_i2c_write, NULL,
+                        CONFIG_SYS_I2C_SOFT_SPEED_3,
+                        CONFIG_SYS_I2C_SOFT_SLAVE_3,
+                        2)
+#endif
+#if defined(I2C_SOFT_DECLARATIONS4)
+U_BOOT_I2C_ADAP_COMPLETE(soft3, soft_i2c_init, soft_i2c_probe,
+                        soft_i2c_read, soft_i2c_write, NULL,
+                        CONFIG_SYS_I2C_SOFT_SPEED_4,
+                        CONFIG_SYS_I2C_SOFT_SLAVE_4,
+                        3)
+#endif