Changeset 25725

Timestamp:

2011-02-26T07:23:23+01:00 (7 years ago)

Author:

nbd

Message:

ixp4xx: fix the i2c pld driver for 2.6.37 - i2c uses a rt_mutex instead of a mutex now

File:

• trunk/target/linux/ixp4xx/patches-2.6.37/020-gateworks_i2c_pld.patch (modified) (6 diffs)

trunk/target/linux/ixp4xx/patches-2.6.37/020-gateworks_i2c_pld.patch

@@ -52 +52 @@
 + * The Gateworks I2C PLD chip does not properly send the acknowledge bit
 + * thus we cannot use standard i2c_smbus functions. We have recreated
-+ * our own here, but we still use the mutex_lock to lock the i2c_bus
++ * our own here, but we still use the rt_mutex_lock to lock the i2c_bus
 + * as the device still exists on the I2C bus.
 +*/
@@ -180 +180 @@
 +       struct gw_i2c_pld *gpio = container_of(chip, struct gw_i2c_pld, chip);
 +       struct i2c_adapter *adap = gpio->client->adapter;
-+       
++
 +       if (in_atomic() || irqs_disabled()) {
-+               ret = mutex_trylock(&adap->bus_lock);
++               ret = rt_mutex_trylock(&adap->bus_lock);
 +               if (!ret)
 +                       /* I2C activity is ongoing. */
 +                       return -EAGAIN;
 +       } else {
-+               mutex_lock_nested(&adap->bus_lock, adap->level);
++               rt_mutex_lock(&adap->bus_lock);
 +       }
 +
@@ -194 +194 @@
 +       ret = i2c_pld_write_byte(gpio->client->addr, gpio->out);
 +
-+       mutex_unlock(&adap->bus_lock);
++       rt_mutex_unlock(&adap->bus_lock);
 +
 +       return ret;
@@ -205 +205 @@
 +       struct gw_i2c_pld *gpio = container_of(chip, struct gw_i2c_pld, chip);
 +       struct i2c_adapter *adap = gpio->client->adapter;
-+       
++
 +       if (in_atomic() || irqs_disabled()) {
-+               ret = mutex_trylock(&adap->bus_lock);
++               ret = rt_mutex_trylock(&adap->bus_lock);
 +               if (!ret)
 +                       /* I2C activity is ongoing. */
 +                       return -EAGAIN;
 +       } else {
-+               mutex_lock_nested(&adap->bus_lock, adap->level);
++               rt_mutex_lock(&adap->bus_lock);
 +       }
 +
 +       value = i2c_pld_read_byte(gpio->client->addr);
 +
-+       mutex_unlock(&adap->bus_lock);
++       rt_mutex_unlock(&adap->bus_lock);
 +
 +       return (value < 0) ? 0 : (value & (1 << offset));
@@ -230 +230 @@
 +
 +       unsigned bit = 1 << offset;
-+       
++
 +       if (in_atomic() || irqs_disabled()) {
-+               ret = mutex_trylock(&adap->bus_lock);
++               ret = rt_mutex_trylock(&adap->bus_lock);
 +               if (!ret)
 +                       /* I2C activity is ongoing. */
 +                       return -EAGAIN;
 +       } else {
-+               mutex_lock_nested(&adap->bus_lock, adap->level);
++               rt_mutex_lock(&adap->bus_lock);
 +       }
 +
@@ -248 +248 @@
 +       ret = i2c_pld_write_byte(gpio->client->addr, gpio->out);
 +
-+       mutex_unlock(&adap->bus_lock);
++       rt_mutex_unlock(&adap->bus_lock);
 +
 +       return ret;