V4L/DVB (10978): Report tuning algorith correctly
[safe/jmp/linux-2.6] / drivers / i2c / i2c-core.c
index e45bb28..e7d9848 100644 (file)
@@ -42,7 +42,9 @@
 static DEFINE_MUTEX(core_lock);
 static DEFINE_IDR(i2c_adapter_idr);
 
-#define is_newstyle_driver(d) ((d)->probe || (d)->remove)
+#define is_newstyle_driver(d) ((d)->probe || (d)->remove || (d)->detect)
+
+static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver);
 
 /* ------------------------------------------------------------------------- */
 
@@ -106,6 +108,9 @@ static int i2c_device_probe(struct device *dev)
        if (!driver->probe || !driver->id_table)
                return -ENODEV;
        client->driver = driver;
+       if (!device_can_wakeup(&client->dev))
+               device_init_wakeup(&client->dev,
+                                       client->flags & I2C_CLIENT_WAKE);
        dev_dbg(dev, "probe\n");
 
        status = driver->probe(client, i2c_match_id(driver->id_table, client));
@@ -260,9 +265,11 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info)
        client->adapter = adap;
 
        client->dev.platform_data = info->platform_data;
-       device_init_wakeup(&client->dev, info->flags & I2C_CLIENT_WAKE);
 
-       client->flags = info->flags & ~I2C_CLIENT_WAKE;
+       if (info->archdata)
+               client->dev.archdata = *info->archdata;
+
+       client->flags = info->flags;
        client->addr = info->addr;
        client->irq = info->irq;
 
@@ -300,6 +307,14 @@ void i2c_unregister_device(struct i2c_client *client)
                return;
        }
 
+       if (adapter->client_unregister) {
+               if (adapter->client_unregister(client)) {
+                       dev_warn(&client->dev,
+                                "client_unregister [%s] failed\n",
+                                client->name);
+               }
+       }
+
        mutex_lock(&adapter->clist_lock);
        list_del(&client->list);
        mutex_unlock(&adapter->clist_lock);
@@ -410,6 +425,10 @@ static int i2c_do_add_adapter(struct device_driver *d, void *data)
        struct i2c_driver *driver = to_i2c_driver(d);
        struct i2c_adapter *adap = data;
 
+       /* Detect supported devices on that bus, and instantiate them */
+       i2c_detect(adap, driver);
+
+       /* Let legacy drivers scan this bus for matching devices */
        if (driver->attach_adapter) {
                /* We ignore the return code; if it fails, too bad */
                driver->attach_adapter(adap);
@@ -421,6 +440,10 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
 {
        int res = 0, dummy;
 
+       /* Can't register until after driver model init */
+       if (unlikely(WARN_ON(!i2c_bus_type.p)))
+               return -EAGAIN;
+
        mutex_init(&adap->bus_lock);
        mutex_init(&adap->clist_lock);
        INIT_LIST_HEAD(&adap->clients);
@@ -436,7 +459,7 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
                pr_debug("I2C adapter driver [%s] forgot to specify "
                         "physical device\n", adap->name);
        }
-       sprintf(adap->dev.bus_id, "i2c-%d", adap->nr);
+       dev_set_name(&adap->dev, "i2c-%d", adap->nr);
        adap->dev.release = &i2c_adapter_dev_release;
        adap->dev.class = &i2c_adapter_class;
        res = device_register(&adap->dev);
@@ -449,7 +472,7 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
        if (adap->nr < __i2c_first_dynamic_bus_num)
                i2c_scan_static_board_info(adap);
 
-       /* let legacy drivers scan this bus for matching devices */
+       /* Notify drivers */
        dummy = bus_for_each_drv(&i2c_bus_type, NULL, adap,
                                 i2c_do_add_adapter);
 
@@ -555,8 +578,19 @@ static int i2c_do_del_adapter(struct device_driver *d, void *data)
 {
        struct i2c_driver *driver = to_i2c_driver(d);
        struct i2c_adapter *adapter = data;
+       struct i2c_client *client, *_n;
        int res;
 
+       /* Remove the devices we created ourselves */
+       list_for_each_entry_safe(client, _n, &driver->clients, detected) {
+               if (client->adapter == adapter) {
+                       dev_dbg(&adapter->dev, "Removing %s at 0x%x\n",
+                               client->name, client->addr);
+                       list_del(&client->detected);
+                       i2c_unregister_device(client);
+               }
+       }
+
        if (!driver->detach_adapter)
                return 0;
        res = driver->detach_adapter(adapter);
@@ -597,7 +631,7 @@ int i2c_del_adapter(struct i2c_adapter *adap)
 
        /* detach any active clients. This must be done first, because
         * it can fail; in which case we give up. */
-       list_for_each_entry_safe(client, _n, &adap->clients, list) {
+       list_for_each_entry_safe_reverse(client, _n, &adap->clients, list) {
                struct i2c_driver       *driver;
 
                driver = client->driver;
@@ -629,6 +663,10 @@ int i2c_del_adapter(struct i2c_adapter *adap)
 
        dev_dbg(&adap->dev, "adapter [%s] unregistered\n", adap->name);
 
+       /* Clear the device structure in case this adapter is ever going to be
+          added again */
+       memset(&adap->dev, 0, sizeof(adap->dev));
+
  out_unlock:
        mutex_unlock(&core_lock);
        return res;
@@ -643,7 +681,11 @@ static int __attach_adapter(struct device *dev, void *data)
        struct i2c_adapter *adapter = to_i2c_adapter(dev);
        struct i2c_driver *driver = data;
 
-       driver->attach_adapter(adapter);
+       i2c_detect(adapter, driver);
+
+       /* Legacy drivers scan i2c busses directly */
+       if (driver->attach_adapter)
+               driver->attach_adapter(adapter);
 
        return 0;
 }
@@ -661,6 +703,10 @@ int i2c_register_driver(struct module *owner, struct i2c_driver *driver)
 {
        int res;
 
+       /* Can't register until after driver model init */
+       if (unlikely(WARN_ON(!i2c_bus_type.p)))
+               return -EAGAIN;
+
        /* new style driver methods can't mix with legacy ones */
        if (is_newstyle_driver(driver)) {
                if (driver->attach_adapter || driver->detach_adapter
@@ -687,10 +733,10 @@ int i2c_register_driver(struct module *owner, struct i2c_driver *driver)
 
        pr_debug("i2c-core: driver [%s] registered\n", driver->driver.name);
 
-       /* legacy drivers scan i2c busses directly */
-       if (driver->attach_adapter)
-               class_for_each_device(&i2c_adapter_class, driver,
-                                     __attach_adapter);
+       INIT_LIST_HEAD(&driver->clients);
+       /* Walk the adapters that are already present */
+       class_for_each_device(&i2c_adapter_class, NULL, driver,
+                             __attach_adapter);
 
        mutex_unlock(&core_lock);
        return 0;
@@ -701,6 +747,17 @@ static int __detach_adapter(struct device *dev, void *data)
 {
        struct i2c_adapter *adapter = to_i2c_adapter(dev);
        struct i2c_driver *driver = data;
+       struct i2c_client *client, *_n;
+
+       list_for_each_entry_safe(client, _n, &driver->clients, detected) {
+               dev_dbg(&adapter->dev, "Removing %s at 0x%x\n",
+                       client->name, client->addr);
+               list_del(&client->detected);
+               i2c_unregister_device(client);
+       }
+
+       if (is_newstyle_driver(driver))
+               return 0;
 
        /* Have a look at each adapter, if clients of this driver are still
         * attached. If so, detach them to be able to kill the driver
@@ -739,10 +796,8 @@ void i2c_del_driver(struct i2c_driver *driver)
 {
        mutex_lock(&core_lock);
 
-       /* legacy driver? */
-       if (!is_newstyle_driver(driver))
-               class_for_each_device(&i2c_adapter_class, driver,
-                                     __detach_adapter);
+       class_for_each_device(&i2c_adapter_class, NULL, driver,
+                             __detach_adapter);
 
        driver_unregister(&driver->driver);
        pr_debug("i2c-core: driver [%s] unregistered\n", driver->driver.name);
@@ -771,7 +826,12 @@ static int i2c_check_addr(struct i2c_adapter *adapter, int addr)
 int i2c_attach_client(struct i2c_client *client)
 {
        struct i2c_adapter *adapter = client->adapter;
-       int res = 0;
+       int res;
+
+       /* Check for address business */
+       res = i2c_check_addr(adapter, client->addr);
+       if (res)
+               return res;
 
        client->dev.parent = &client->adapter->dev;
        client->dev.bus = &i2c_bus_type;
@@ -785,8 +845,8 @@ int i2c_attach_client(struct i2c_client *client)
        } else
                client->dev.release = i2c_client_dev_release;
 
-       snprintf(&client->dev.bus_id[0], sizeof(client->dev.bus_id),
-               "%d-%04x", i2c_adapter_id(adapter), client->addr);
+       dev_set_name(&client->dev, "%d-%04x", i2c_adapter_id(adapter),
+                    client->addr);
        res = device_register(&client->dev);
        if (res)
                goto out_err;
@@ -796,7 +856,7 @@ int i2c_attach_client(struct i2c_client *client)
        mutex_unlock(&adapter->clist_lock);
 
        dev_dbg(&adapter->dev, "client [%s] registered with bus id %s\n",
-               client->name, client->dev.bus_id);
+               client->name, dev_name(&client->dev));
 
        if (adapter->client_register)  {
                if (adapter->client_register(client)) {
@@ -929,7 +989,10 @@ static void __exit i2c_exit(void)
        bus_unregister(&i2c_bus_type);
 }
 
-subsys_initcall(i2c_init);
+/* We must initialize early, because some subsystems register i2c drivers
+ * in subsys_initcall() code, but are linked (and initialized) before i2c.
+ */
+postcore_initcall(i2c_init);
 module_exit(i2c_exit);
 
 /* ----------------------------------------------------
@@ -1141,8 +1204,8 @@ int i2c_probe(struct i2c_adapter *adapter,
                 && address_data->normal_i2c[0] == I2C_CLIENT_END)
                        return 0;
 
-               dev_warn(&adapter->dev, "SMBus Quick command not supported, "
-                        "can't probe for chips\n");
+               dev_dbg(&adapter->dev, "SMBus Quick command not supported, "
+                       "can't probe for chips\n");
                return -EOPNOTSUPP;
        }
 
@@ -1197,6 +1260,179 @@ int i2c_probe(struct i2c_adapter *adapter,
 }
 EXPORT_SYMBOL(i2c_probe);
 
+/* Separate detection function for new-style drivers */
+static int i2c_detect_address(struct i2c_client *temp_client, int kind,
+                             struct i2c_driver *driver)
+{
+       struct i2c_board_info info;
+       struct i2c_adapter *adapter = temp_client->adapter;
+       int addr = temp_client->addr;
+       int err;
+
+       /* Make sure the address is valid */
+       if (addr < 0x03 || addr > 0x77) {
+               dev_warn(&adapter->dev, "Invalid probe address 0x%02x\n",
+                        addr);
+               return -EINVAL;
+       }
+
+       /* Skip if already in use */
+       if (i2c_check_addr(adapter, addr))
+               return 0;
+
+       /* Make sure there is something at this address, unless forced */
+       if (kind < 0) {
+               if (i2c_smbus_xfer(adapter, addr, 0, 0, 0,
+                                  I2C_SMBUS_QUICK, NULL) < 0)
+                       return 0;
+
+               /* prevent 24RF08 corruption */
+               if ((addr & ~0x0f) == 0x50)
+                       i2c_smbus_xfer(adapter, addr, 0, 0, 0,
+                                      I2C_SMBUS_QUICK, NULL);
+       }
+
+       /* Finally call the custom detection function */
+       memset(&info, 0, sizeof(struct i2c_board_info));
+       info.addr = addr;
+       err = driver->detect(temp_client, kind, &info);
+       if (err) {
+               /* -ENODEV is returned if the detection fails. We catch it
+                  here as this isn't an error. */
+               return err == -ENODEV ? 0 : err;
+       }
+
+       /* Consistency check */
+       if (info.type[0] == '\0') {
+               dev_err(&adapter->dev, "%s detection function provided "
+                       "no name for 0x%x\n", driver->driver.name,
+                       addr);
+       } else {
+               struct i2c_client *client;
+
+               /* Detection succeeded, instantiate the device */
+               dev_dbg(&adapter->dev, "Creating %s at 0x%02x\n",
+                       info.type, info.addr);
+               client = i2c_new_device(adapter, &info);
+               if (client)
+                       list_add_tail(&client->detected, &driver->clients);
+               else
+                       dev_err(&adapter->dev, "Failed creating %s at 0x%02x\n",
+                               info.type, info.addr);
+       }
+       return 0;
+}
+
+static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver)
+{
+       const struct i2c_client_address_data *address_data;
+       struct i2c_client *temp_client;
+       int i, err = 0;
+       int adap_id = i2c_adapter_id(adapter);
+
+       address_data = driver->address_data;
+       if (!driver->detect || !address_data)
+               return 0;
+
+       /* Set up a temporary client to help detect callback */
+       temp_client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
+       if (!temp_client)
+               return -ENOMEM;
+       temp_client->adapter = adapter;
+
+       /* Force entries are done first, and are not affected by ignore
+          entries */
+       if (address_data->forces) {
+               const unsigned short * const *forces = address_data->forces;
+               int kind;
+
+               for (kind = 0; forces[kind]; kind++) {
+                       for (i = 0; forces[kind][i] != I2C_CLIENT_END;
+                            i += 2) {
+                               if (forces[kind][i] == adap_id
+                                || forces[kind][i] == ANY_I2C_BUS) {
+                                       dev_dbg(&adapter->dev, "found force "
+                                               "parameter for adapter %d, "
+                                               "addr 0x%02x, kind %d\n",
+                                               adap_id, forces[kind][i + 1],
+                                               kind);
+                                       temp_client->addr = forces[kind][i + 1];
+                                       err = i2c_detect_address(temp_client,
+                                               kind, driver);
+                                       if (err)
+                                               goto exit_free;
+                               }
+                       }
+               }
+       }
+
+       /* Stop here if the classes do not match */
+       if (!(adapter->class & driver->class))
+               goto exit_free;
+
+       /* Stop here if we can't use SMBUS_QUICK */
+       if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_QUICK)) {
+               if (address_data->probe[0] == I2C_CLIENT_END
+                && address_data->normal_i2c[0] == I2C_CLIENT_END)
+                       goto exit_free;
+
+               dev_warn(&adapter->dev, "SMBus Quick command not supported, "
+                        "can't probe for chips\n");
+               err = -EOPNOTSUPP;
+               goto exit_free;
+       }
+
+       /* Probe entries are done second, and are not affected by ignore
+          entries either */
+       for (i = 0; address_data->probe[i] != I2C_CLIENT_END; i += 2) {
+               if (address_data->probe[i] == adap_id
+                || address_data->probe[i] == ANY_I2C_BUS) {
+                       dev_dbg(&adapter->dev, "found probe parameter for "
+                               "adapter %d, addr 0x%02x\n", adap_id,
+                               address_data->probe[i + 1]);
+                       temp_client->addr = address_data->probe[i + 1];
+                       err = i2c_detect_address(temp_client, -1, driver);
+                       if (err)
+                               goto exit_free;
+               }
+       }
+
+       /* Normal entries are done last, unless shadowed by an ignore entry */
+       for (i = 0; address_data->normal_i2c[i] != I2C_CLIENT_END; i += 1) {
+               int j, ignore;
+
+               ignore = 0;
+               for (j = 0; address_data->ignore[j] != I2C_CLIENT_END;
+                    j += 2) {
+                       if ((address_data->ignore[j] == adap_id ||
+                            address_data->ignore[j] == ANY_I2C_BUS)
+                        && address_data->ignore[j + 1]
+                           == address_data->normal_i2c[i]) {
+                               dev_dbg(&adapter->dev, "found ignore "
+                                       "parameter for adapter %d, "
+                                       "addr 0x%02x\n", adap_id,
+                                       address_data->ignore[j + 1]);
+                               ignore = 1;
+                               break;
+                       }
+               }
+               if (ignore)
+                       continue;
+
+               dev_dbg(&adapter->dev, "found normal entry for adapter %d, "
+                       "addr 0x%02x\n", adap_id,
+                       address_data->normal_i2c[i]);
+               temp_client->addr = address_data->normal_i2c[i];
+               err = i2c_detect_address(temp_client, -1, driver);
+               if (err)
+                       goto exit_free;
+       }
+
+ exit_free:
+       kfree(temp_client);
+       return err;
+}
+
 struct i2c_client *
 i2c_new_probed_device(struct i2c_adapter *adap,
                      struct i2c_board_info *info,
@@ -1236,9 +1472,11 @@ i2c_new_probed_device(struct i2c_adapter *adap,
                if ((addr_list[i] & ~0x07) == 0x30
                 || (addr_list[i] & ~0x0f) == 0x50
                 || !i2c_check_functionality(adap, I2C_FUNC_SMBUS_QUICK)) {
+                       union i2c_smbus_data data;
+
                        if (i2c_smbus_xfer(adap, addr_list[i], 0,
                                           I2C_SMBUS_READ, 0,
-                                          I2C_SMBUS_BYTE, NULL) >= 0)
+                                          I2C_SMBUS_BYTE, &data) >= 0)
                                break;
                } else {
                        if (i2c_smbus_xfer(adap, addr_list[i], 0,
@@ -1453,6 +1691,28 @@ s32 i2c_smbus_write_word_data(struct i2c_client *client, u8 command, u16 value)
 EXPORT_SYMBOL(i2c_smbus_write_word_data);
 
 /**
+ * i2c_smbus_process_call - SMBus "process call" protocol
+ * @client: Handle to slave device
+ * @command: Byte interpreted by slave
+ * @value: 16-bit "word" being written
+ *
+ * This executes the SMBus "process call" protocol, returning negative errno
+ * else a 16-bit unsigned "word" received from the device.
+ */
+s32 i2c_smbus_process_call(struct i2c_client *client, u8 command, u16 value)
+{
+       union i2c_smbus_data data;
+       int status;
+       data.word = value;
+
+       status = i2c_smbus_xfer(client->adapter, client->addr, client->flags,
+                               I2C_SMBUS_WRITE, command,
+                               I2C_SMBUS_PROC_CALL, &data);
+       return (status < 0) ? status : data.word;
+}
+EXPORT_SYMBOL(i2c_smbus_process_call);
+
+/**
  * i2c_smbus_read_block_data - SMBus "block read" protocol
  * @client: Handle to slave device
  * @command: Byte interpreted by slave
@@ -1571,7 +1831,8 @@ static s32 i2c_smbus_xfer_emulated(struct i2c_adapter * adapter, u16 addr,
        case I2C_SMBUS_QUICK:
                msg[0].len = 0;
                /* Special case: The read/write field is used as data */
-               msg[0].flags = flags | (read_write==I2C_SMBUS_READ)?I2C_M_RD:0;
+               msg[0].flags = flags | (read_write == I2C_SMBUS_READ ?
+                                       I2C_M_RD : 0);
                num = 1;
                break;
        case I2C_SMBUS_BYTE: