Patched in Tegra support.

4 files changed, 37 insertions, 53 deletions

diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index fad22b0bb5b..eca3bcc4599 100644
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -15,8 +15,7 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA 02110-1301 USA.
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  * ------------------------------------------------------------------------- */
 
 /* With some changes from Frodo Looijaard <frodol@dds.nl>, Kyösti Mälkki
@@ -48,8 +47,8 @@
 /* ----- global variables --------------------------------------------- */
 
 static int bit_test;    /* see if the line-setting functions work       */
-module_param(bit_test, int, S_IRUGO);
-MODULE_PARM_DESC(bit_test, "lines testing - 0 off; 1 report; 2 fail if stuck");
+module_param(bit_test, bool, 0);
+MODULE_PARM_DESC(bit_test, "Test the lines of the bus to see if it is stuck");
 
 #ifdef DEBUG
 static int i2c_debug = 1;
@@ -104,15 +103,9 @@ static int sclhi(struct i2c_algo_bit_data *adap)
                  * chips may hold it low ("clock stretching") while they
                  * are processing data internally.
                  */
-                if (time_after(jiffies, start + adap->timeout)) {
-                        /* Test one last time, as we may have been preempted
-                         * between last check and timeout test.
-                         */
-                        if (getscl(adap))
-                                break;
+                if (time_after(jiffies, start + adap->timeout))
                         return -ETIMEDOUT;
-                }
-                cpu_relax();
+                cond_resched();
         }
 #ifdef DEBUG
         if (jiffies != start && i2c_debug >= 3)
@@ -257,9 +250,7 @@ static int test_bus(struct i2c_adapter *i2c_adap)
         sda = getsda(adap);
         scl = (adap->getscl == NULL) ? 1 : getscl(adap);
         if (!scl || !sda) {
-                printk(KERN_WARNING
-                       "%s: bus seems to be busy (scl=%d, sda=%d)\n",
-                       name, scl, sda);
+                printk(KERN_WARNING "%s: bus seems to be busy\n", name);
                 goto bailout;
         }
 
@@ -450,7 +441,7 @@ static int readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
                                         acknak(i2c_adap, 0);
                                 dev_err(&i2c_adap->dev, "readbytes: invalid "
                                         "block length (%d)\n", inval);
-                                return -EPROTO;
+                                return -EREMOTEIO;
                         }
                         /* The original count value accounts for the extra
                            bytes, that is, either 1 for a regular transaction,
@@ -479,7 +470,7 @@ static int readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
  * reads, writes as well as 10bit-addresses.
  * returns:
  *  0 everything went okay, the chip ack'ed, or IGNORE_NAK flag was set
- * -x an error occurred (like: -ENXIO if the device did not answer, or
+ * -x an error occurred (like: -EREMOTEIO if the device did not answer, or
  *      -ETIMEDOUT, for example if the lines are stuck...)
  */
 static int bit_doAddress(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
@@ -502,14 +493,14 @@ static int bit_doAddress(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
                 if ((ret != 1) && !nak_ok)  {
                         dev_err(&i2c_adap->dev,
                                 "died at extended address code\n");
-                        return -ENXIO;
+                        return -EREMOTEIO;
                 }
                 /* the remaining 8 bit address */
                 ret = i2c_outb(i2c_adap, msg->addr & 0xff);
                 if ((ret != 1) && !nak_ok) {
                         /* the chip did not ack / xmission error occurred */
                         dev_err(&i2c_adap->dev, "died at 2nd address code\n");
-                        return -ENXIO;
+                        return -EREMOTEIO;
                 }
                 if (flags & I2C_M_RD) {
                         bit_dbg(3, &i2c_adap->dev, "emitting repeated "
@@ -521,7 +512,7 @@ static int bit_doAddress(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
                         if ((ret != 1) && !nak_ok) {
                                 dev_err(&i2c_adap->dev,
                                         "died at repeated address code\n");
-                                return -EIO;
+                                return -EREMOTEIO;
                         }
                 }
         } else {                /* normal 7bit address  */
@@ -579,7 +570,7 @@ static int bit_xfer(struct i2c_adapter *i2c_adap,
                                         ret, ret == 1 ? "" : "s");
                         if (ret < pmsg->len) {
                                 if (ret >= 0)
-                                        ret = -EIO;
+                                        ret = -EREMOTEIO;
                                 goto bailout;
                         }
                 } else {
@@ -590,7 +581,7 @@ static int bit_xfer(struct i2c_adapter *i2c_adap,
                                         ret, ret == 1 ? "" : "s");
                         if (ret < pmsg->len) {
                                 if (ret >= 0)
-                                        ret = -EIO;
+                                        ret = -EREMOTEIO;
                                 goto bailout;
                         }
                 }
@@ -608,7 +599,7 @@ bailout:
 
 static u32 bit_func(struct i2c_adapter *adap)
 {
-        return I2C_FUNC_I2C | I2C_FUNC_NOSTART | I2C_FUNC_SMBUS_EMUL |
+        return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL |
                I2C_FUNC_SMBUS_READ_BLOCK_DATA |
                I2C_FUNC_SMBUS_BLOCK_PROC_CALL |
                I2C_FUNC_10BIT_ADDR | I2C_FUNC_PROTOCOL_MANGLING;
@@ -617,11 +608,10 @@ static u32 bit_func(struct i2c_adapter *adap)
 
 /* -----exported algorithm data: -------------------------------------  */
 
-const struct i2c_algorithm i2c_bit_algo = {
+static const struct i2c_algorithm i2c_bit_algo = {
         .master_xfer    = bit_xfer,
         .functionality  = bit_func,
 };
-EXPORT_SYMBOL(i2c_bit_algo);
 
 /*
  * registering functions to load algorithms at runtime
@@ -634,7 +624,7 @@ static int __i2c_bit_add_bus(struct i2c_adapter *adap,
 
         if (bit_test) {
                 ret = test_bus(adap);
-                if (bit_test >= 2 && ret < 0)
+                if (ret < 0)
                         return -ENODEV;
         }
 
diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c
index f892a424009..4ca9cf9cde7 100644
--- a/drivers/i2c/algos/i2c-algo-pca.c
+++ b/drivers/i2c/algos/i2c-algo-pca.c
@@ -15,8 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- *  MA 02110-1301 USA.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <linux/kernel.h>
@@ -46,19 +45,14 @@ static int i2c_debug;
 #define pca_set_con(adap, val) pca_outw(adap, I2C_PCA_CON, val)
 #define pca_get_con(adap) pca_inw(adap, I2C_PCA_CON)
 #define pca_wait(adap) adap->wait_for_completion(adap->data)
+#define pca_reset(adap) adap->reset_chip(adap->data)
 
-static void pca_reset(struct i2c_algo_pca_data *adap)
+static void pca9665_reset(void *pd)
 {
-        if (adap->chip == I2C_PCA_CHIP_9665) {
-                /* Ignore the reset function from the module,
-                 * we can use the parallel bus reset.
-                 */
-                pca_outw(adap, I2C_PCA_INDPTR, I2C_PCA_IPRESET);
-                pca_outw(adap, I2C_PCA_IND, 0xA5);
-                pca_outw(adap, I2C_PCA_IND, 0x5A);
-        } else {
-                adap->reset_chip(adap->data);
-        }
+        struct i2c_algo_pca_data *adap = pd;
+        pca_outw(adap, I2C_PCA_INDPTR, I2C_PCA_IPRESET);
+        pca_outw(adap, I2C_PCA_IND, 0xA5);
+        pca_outw(adap, I2C_PCA_IND, 0x5A);
 }
 
 /*
@@ -202,7 +196,7 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
                 } else {
                         dev_dbg(&i2c_adap->dev, "bus is not idle. status is "
                                 "%#04x\n", state);
-                        return -EBUSY;
+                        return -EAGAIN;
                 }
         }
 
@@ -230,7 +224,7 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
         }
 
         curmsg = 0;
-        ret = -EIO;
+        ret = -EREMOTEIO;
         while (curmsg < num) {
                 state = pca_status(adap);
 
@@ -265,7 +259,6 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
                 case 0x20: /* SLA+W has been transmitted; NOT ACK has been received */
                         DEB2("NOT ACK received after SLA+W\n");
                         pca_stop(adap);
-                        ret = -ENXIO;
                         goto out;
 
                 case 0x40: /* SLA+R has been transmitted; ACK has been received */
@@ -290,7 +283,6 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
                 case 0x48: /* SLA+R has been transmitted; NOT ACK has been received */
                         DEB2("NOT ACK received after SLA+R\n");
                         pca_stop(adap);
-                        ret = -ENXIO;
                         goto out;
 
                 case 0x30: /* Data byte in I2CDAT has been transmitted; NOT ACK has been received */
@@ -383,12 +375,11 @@ static unsigned int pca_probe_chip(struct i2c_adapter *adap)
         pca_outw(pca_data, I2C_PCA_INDPTR, I2C_PCA_IADR);
         if (pca_inw(pca_data, I2C_PCA_IND) == 0xAA) {
                 printk(KERN_INFO "%s: PCA9665 detected.\n", adap->name);
-                pca_data->chip = I2C_PCA_CHIP_9665;
+                return I2C_PCA_CHIP_9665;
         } else {
                 printk(KERN_INFO "%s: PCA9564 detected.\n", adap->name);
-                pca_data->chip = I2C_PCA_CHIP_9564;
+                return I2C_PCA_CHIP_9564;
         }
-        return pca_data->chip;
 }
 
 static int pca_init(struct i2c_adapter *adap)
@@ -462,6 +453,11 @@ static int pca_init(struct i2c_adapter *adap)
                  */
                 int raise_fall_time;
 
+                /* Ignore the reset function from the module,
+                 * we can use the parallel bus reset
+                 */
+                pca_data->reset_chip = pca9665_reset;
+
                 if (pca_data->i2c_clock > 1265800) {
                         printk(KERN_WARNING "%s: I2C clock speed too high."
                                 " Using 1265.8kHz.\n", adap->name);
@@ -477,17 +473,17 @@ static int pca_init(struct i2c_adapter *adap)
                 /* To avoid integer overflow, use clock/100 for calculations */
                 clock = pca_clock(pca_data) / 100;
 
-                if (pca_data->i2c_clock > 1000000) {
+                if (pca_data->i2c_clock > 10000) {
                         mode = I2C_PCA_MODE_TURBO;
                         min_tlow = 14;
                         min_thi  = 5;
                         raise_fall_time = 22; /* Raise 11e-8s, Fall 11e-8s */
-                } else if (pca_data->i2c_clock > 400000) {
+                } else if (pca_data->i2c_clock > 4000) {
                         mode = I2C_PCA_MODE_FASTP;
                         min_tlow = 17;
                         min_thi  = 9;
                         raise_fall_time = 22; /* Raise 11e-8s, Fall 11e-8s */
-                } else if (pca_data->i2c_clock > 100000) {
+                } else if (pca_data->i2c_clock > 1000) {
                         mode = I2C_PCA_MODE_FAST;
                         min_tlow = 44;
                         min_thi  = 20;
diff --git a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c
index 5c2379522aa..5eebf562ff3 100644
--- a/drivers/i2c/algos/i2c-algo-pcf.c
+++ b/drivers/i2c/algos/i2c-algo-pcf.c
@@ -16,8 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- *  MA 02110-1301 USA.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and
  * Frodo Looijaard <frodol@dds.nl>, and also from Martin Bailey
diff --git a/drivers/i2c/algos/i2c-algo-pcf.h b/drivers/i2c/algos/i2c-algo-pcf.h
index 1ec703ee788..5263a9eeb8d 100644
--- a/drivers/i2c/algos/i2c-algo-pcf.h
+++ b/drivers/i2c/algos/i2c-algo-pcf.h
@@ -16,8 +16,7 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA 02110-1301 USA.                                                  */
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.           */
 /* -------------------------------------------------------------------- */
 
 /* With some changes from Frodo Looijaard <frodol@dds.nl> */