2 files changed, 5 insertions, 0 deletions

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 42e852d79ff..5a485c22660 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -266,6 +266,9 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info)
 
         client->dev.platform_data = info->platform_data;
 
+        if (info->archdata)
+                client->dev.archdata = *info->archdata;
+
         client->flags = info->flags;
         client->addr = info->addr;
         client->irq = info->irq;
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 12d7364ad3f..33a5992d493 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -239,6 +239,7 @@ static inline void i2c_set_clientdata(struct i2c_client *dev, void *data)
  * @flags: to initialize i2c_client.flags
  * @addr: stored in i2c_client.addr
  * @platform_data: stored in i2c_client.dev.platform_data
+ * @archdata: copied into i2c_client.dev.archdata
  * @irq: stored in i2c_client.irq
  *
  * I2C doesn't actually support hardware probing, although controllers and
@@ -258,6 +259,7 @@ struct i2c_board_info {
         unsigned short  flags;
         unsigned short  addr;
         void            *platform_data;
+        struct dev_archdata     *archdata;
         int             irq;
 };