Merge branch 'core/xen' into x86/urgent

35 files changed, 0 insertions, 1131 deletions

diff --git a/drivers/i2c/busses/i2c-acorn.c b/drivers/i2c/busses/i2c-acorn.c
index 75089febbc13..9fee3ca17344 100644
--- a/drivers/i2c/busses/i2c-acorn.c
+++ b/drivers/i2c/busses/i2c-acorn.c
@@ -83,7 +83,6 @@ static struct i2c_algo_bit_data ioc_data = {
 };
 
 static struct i2c_adapter ioc_ops = {
-        .id                     = I2C_HW_B_IOC,
         .algo_data              = &ioc_data,
 };
 
diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c
index 9cead9b9458e..981e080b32ae 100644
--- a/drivers/i2c/busses/i2c-ali1535.c
+++ b/drivers/i2c/busses/i2c-ali1535.c
@@ -476,7 +476,6 @@ static const struct i2c_algorithm smbus_algorithm = {
 
 static struct i2c_adapter ali1535_adapter = {
         .owner          = THIS_MODULE,
-        .id             = I2C_HW_SMBUS_ALI1535,
         .class          = I2C_CLASS_HWMON | I2C_CLASS_SPD,
         .algo           = &smbus_algorithm,
 };
diff --git a/drivers/i2c/busses/i2c-ali1563.c b/drivers/i2c/busses/i2c-ali1563.c
index dd9e796fad69..f70f46582c6c 100644
--- a/drivers/i2c/busses/i2c-ali1563.c
+++ b/drivers/i2c/busses/i2c-ali1563.c
@@ -386,7 +386,6 @@ static const struct i2c_algorithm ali1563_algorithm = {
 
 static struct i2c_adapter ali1563_adapter = {
         .owner  = THIS_MODULE,
-        .id     = I2C_HW_SMBUS_ALI1563,
         .class  = I2C_CLASS_HWMON | I2C_CLASS_SPD,
         .algo   = &ali1563_algorithm,
 };
diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c
index 234fdde7d40e..39066dee46e3 100644
--- a/drivers/i2c/busses/i2c-ali15x3.c
+++ b/drivers/i2c/busses/i2c-ali15x3.c
@@ -473,7 +473,6 @@ static const struct i2c_algorithm smbus_algorithm = {
 
 static struct i2c_adapter ali15x3_adapter = {
         .owner          = THIS_MODULE,
-        .id             = I2C_HW_SMBUS_ALI15X3,
         .class          = I2C_CLASS_HWMON | I2C_CLASS_SPD,
         .algo           = &smbus_algorithm,
 };
diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c
index 36bee5b9c952..220f4a1eee1d 100644
--- a/drivers/i2c/busses/i2c-amd756.c
+++ b/drivers/i2c/busses/i2c-amd756.c
@@ -298,7 +298,6 @@ static const struct i2c_algorithm smbus_algorithm = {
 
 struct i2c_adapter amd756_smbus = {
         .owner          = THIS_MODULE,
-        .id             = I2C_HW_SMBUS_AMD756,
         .class          = I2C_CLASS_HWMON | I2C_CLASS_SPD,
         .algo           = &smbus_algorithm,
 };
diff --git a/drivers/i2c/busses/i2c-amd8111.c b/drivers/i2c/busses/i2c-amd8111.c
index 3972208876b3..edab51973bf5 100644
--- a/drivers/i2c/busses/i2c-amd8111.c
+++ b/drivers/i2c/busses/i2c-amd8111.c
@@ -387,7 +387,6 @@ static int __devinit amd8111_probe(struct pci_dev *dev,
         smbus->adapter.owner = THIS_MODULE;
         snprintf(smbus->adapter.name, sizeof(smbus->adapter.name),
                 "SMBus2 AMD8111 adapter at %04x", smbus->base);
-        smbus->adapter.id = I2C_HW_SMBUS_AMD8111;
         smbus->adapter.class = I2C_CLASS_HWMON | I2C_CLASS_SPD;
         smbus->adapter.algo = &smbus_algorithm;
         smbus->adapter.algo_data = smbus;
diff --git a/drivers/i2c/busses/i2c-au1550.c b/drivers/i2c/busses/i2c-au1550.c
index 66a04c2c660f..f78ce523e3db 100644
--- a/drivers/i2c/busses/i2c-au1550.c
+++ b/drivers/i2c/busses/i2c-au1550.c
@@ -400,7 +400,6 @@ i2c_au1550_probe(struct platform_device *pdev)
         priv->xfer_timeout = 200;
         priv->ack_timeout = 200;
 
-        priv->adap.id = I2C_HW_AU1550_PSC;
         priv->adap.nr = pdev->id;
         priv->adap.algo = &au1550_algo;
         priv->adap.algo_data = priv;
diff --git a/drivers/i2c/busses/i2c-bfin-twi.c b/drivers/i2c/busses/i2c-bfin-twi.c
index 3fd2c417c1e0..fc548b3d002e 100644
--- a/drivers/i2c/busses/i2c-bfin-twi.c
+++ b/drivers/i2c/busses/i2c-bfin-twi.c
@@ -651,7 +651,6 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
         iface->timeout_timer.data = (unsigned long)iface;
 
         p_adap = &iface->adap;
-        p_adap->id = I2C_HW_BLACKFIN;
         p_adap->nr = pdev->id;
         strlcpy(p_adap->name, pdev->name, sizeof(p_adap->name));
         p_adap->algo = &bfin_twi_algorithm;
diff --git a/drivers/i2c/busses/i2c-elektor.c b/drivers/i2c/busses/i2c-elektor.c
index 0ed3ccb81b63..448b4bf35eb7 100644
--- a/drivers/i2c/busses/i2c-elektor.c
+++ b/drivers/i2c/busses/i2c-elektor.c
@@ -202,7 +202,6 @@ static struct i2c_algo_pcf_data pcf_isa_data = {
 static struct i2c_adapter pcf_isa_ops = {
         .owner          = THIS_MODULE,
         .class          = I2C_CLASS_HWMON | I2C_CLASS_SPD,
-        .id             = I2C_HW_P_ELEK,
         .algo_data      = &pcf_isa_data,
         .name           = "i2c-elektor",
 };
diff --git a/drivers/i2c/busses/i2c-hydra.c b/drivers/i2c/busses/i2c-hydra.c
index 648aa7baff83..bec9b845dd16 100644
--- a/drivers/i2c/busses/i2c-hydra.c
+++ b/drivers/i2c/busses/i2c-hydra.c
@@ -102,7 +102,6 @@ static struct i2c_algo_bit_data hydra_bit_data = {
 static struct i2c_adapter hydra_adap = {
         .owner          = THIS_MODULE,
         .name           = "Hydra i2c",
-        .id             = I2C_HW_B_HYDRA,
         .algo_data      = &hydra_bit_data,
 };
 
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 526625eaa84b..230238df56c4 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -556,7 +556,6 @@ static const struct i2c_algorithm smbus_algorithm = {
 
 static struct i2c_adapter i801_adapter = {
         .owner          = THIS_MODULE,
-        .id             = I2C_HW_SMBUS_I801,
         .class          = I2C_CLASS_HWMON | I2C_CLASS_SPD,
         .algo           = &smbus_algorithm,
 };
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index 651f2f1ae5b7..88f0db73b364 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -746,7 +746,6 @@ static int __devinit iic_probe(struct of_device *ofdev,
         adap->dev.parent = &ofdev->dev;
         strlcpy(adap->name, "IBM IIC", sizeof(adap->name));
         i2c_set_adapdata(adap, dev);
-        adap->id = I2C_HW_OCP;
         adap->class = I2C_CLASS_HWMON | I2C_CLASS_SPD;
         adap->algo = &iic_algo;
         adap->timeout = 1;
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c
index fc2714ac0c0f..3190690c26ce 100644
--- a/drivers/i2c/busses/i2c-iop3xx.c
+++ b/drivers/i2c/busses/i2c-iop3xx.c
@@ -480,7 +480,6 @@ iop3xx_i2c_probe(struct platform_device *pdev)
         }
 
         memcpy(new_adapter->name, pdev->name, strlen(pdev->name));
-        new_adapter->id = I2C_HW_IOP3XX;
         new_adapter->owner = THIS_MODULE;
         new_adapter->class = I2C_CLASS_HWMON | I2C_CLASS_SPD;
         new_adapter->dev.parent = &pdev->dev;
diff --git a/drivers/i2c/busses/i2c-ixp2000.c b/drivers/i2c/busses/i2c-ixp2000.c
index 05d72e981353..8e8467970481 100644
--- a/drivers/i2c/busses/i2c-ixp2000.c
+++ b/drivers/i2c/busses/i2c-ixp2000.c
@@ -116,7 +116,6 @@ static int ixp2000_i2c_probe(struct platform_device *plat_dev)
         drv_data->algo_data.udelay = 6;
         drv_data->algo_data.timeout = 100;
 
-        drv_data->adapter.id = I2C_HW_B_IXP2000,
         strlcpy(drv_data->adapter.name, plat_dev->dev.driver->name,
                 sizeof(drv_data->adapter.name));
         drv_data->adapter.algo_data = &drv_data->algo_data,
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index a9a45fcc8544..aedbbe6618db 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -310,7 +310,6 @@ static const struct i2c_algorithm mpc_algo = {
 static struct i2c_adapter mpc_ops = {
         .owner = THIS_MODULE,
         .name = "MPC adapter",
-        .id = I2C_HW_MPC107,
         .algo = &mpc_algo,
         .timeout = 1,
 };
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 9e8118d2fe64..eeda276f8f16 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -527,7 +527,6 @@ mv64xxx_i2c_probe(struct platform_device *pd)
                 goto exit_unmap_regs;
         }
         drv_data->adapter.dev.parent = &pd->dev;
-        drv_data->adapter.id = I2C_HW_MV64XXX;
         drv_data->adapter.algo = &mv64xxx_i2c_algo;
         drv_data->adapter.owner = THIS_MODULE;
         drv_data->adapter.class = I2C_CLASS_HWMON | I2C_CLASS_SPD;
diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c
index 3b19bc41a60b..05af6cd7f270 100644
--- a/drivers/i2c/busses/i2c-nforce2.c
+++ b/drivers/i2c/busses/i2c-nforce2.c
@@ -355,7 +355,6 @@ static int __devinit nforce2_probe_smb (struct pci_dev *dev, int bar,
                 return -EBUSY;
         }
         smbus->adapter.owner = THIS_MODULE;
-        smbus->adapter.id = I2C_HW_SMBUS_NFORCE2;
         smbus->adapter.class = I2C_CLASS_HWMON | I2C_CLASS_SPD;
         smbus->adapter.algo = &smbus_algorithm;
         smbus->adapter.algo_data = smbus;
diff --git a/drivers/i2c/busses/i2c-parport-light.c b/drivers/i2c/busses/i2c-parport-light.c
index b2b8380f6602..322c5691e38e 100644
--- a/drivers/i2c/busses/i2c-parport-light.c
+++ b/drivers/i2c/busses/i2c-parport-light.c
@@ -115,7 +115,6 @@ static struct i2c_algo_bit_data parport_algo_data = {
 static struct i2c_adapter parport_adapter = {
         .owner          = THIS_MODULE,
         .class          = I2C_CLASS_HWMON,
-        .id             = I2C_HW_B_LP,
         .algo_data      = &parport_algo_data,
         .name           = "Parallel port adapter (light)",
 };
diff --git a/drivers/i2c/busses/i2c-parport.c b/drivers/i2c/busses/i2c-parport.c
index a257cd5cd134..0d8998610c74 100644
--- a/drivers/i2c/busses/i2c-parport.c
+++ b/drivers/i2c/busses/i2c-parport.c
@@ -164,7 +164,6 @@ static void i2c_parport_attach (struct parport *port)
         /* Fill the rest of the structure */
         adapter->adapter.owner = THIS_MODULE;
         adapter->adapter.class = I2C_CLASS_HWMON;
-        adapter->adapter.id = I2C_HW_B_LP;
         strlcpy(adapter->adapter.name, "Parallel port adapter",
                 sizeof(adapter->adapter.name));
         adapter->algo_data = parport_algo_data;
diff --git a/drivers/i2c/busses/i2c-pca-isa.c b/drivers/i2c/busses/i2c-pca-isa.c
index 9eb76268ec78..4aa8138cb0a9 100644
--- a/drivers/i2c/busses/i2c-pca-isa.c
+++ b/drivers/i2c/busses/i2c-pca-isa.c
@@ -101,7 +101,6 @@ static struct i2c_algo_pca_data pca_isa_data = {
 
 static struct i2c_adapter pca_isa_ops = {
         .owner          = THIS_MODULE,
-        .id             = I2C_HW_A_ISA,
         .algo_data      = &pca_isa_data,
         .name           = "PCA9564 ISA Adapter",
         .timeout        = 100,
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index eaa9b387543e..761f9dd53620 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -403,7 +403,6 @@ static const struct i2c_algorithm smbus_algorithm = {
 
 static struct i2c_adapter piix4_adapter = {
         .owner          = THIS_MODULE,
-        .id             = I2C_HW_SMBUS_PIIX4,
         .class          = I2C_CLASS_HWMON | I2C_CLASS_SPD,
         .algo           = &smbus_algorithm,
 };
diff --git a/drivers/i2c/busses/i2c-sibyte.c b/drivers/i2c/busses/i2c-sibyte.c
index 4ddefbf238e9..98b1ec489159 100644
--- a/drivers/i2c/busses/i2c-sibyte.c
+++ b/drivers/i2c/busses/i2c-sibyte.c
@@ -155,7 +155,6 @@ static struct i2c_algo_sibyte_data sibyte_board_data[2] = {
 static struct i2c_adapter sibyte_board_adapter[2] = {
         {
                 .owner          = THIS_MODULE,
-                .id             = I2C_HW_SIBYTE,
                 .class          = I2C_CLASS_HWMON | I2C_CLASS_SPD,
                 .algo           = NULL,
                 .algo_data      = &sibyte_board_data[0],
@@ -164,7 +163,6 @@ static struct i2c_adapter sibyte_board_adapter[2] = {
         },
         {
                 .owner          = THIS_MODULE,
-                .id             = I2C_HW_SIBYTE,
                 .class          = I2C_CLASS_HWMON | I2C_CLASS_SPD,
                 .algo           = NULL,
                 .algo_data      = &sibyte_board_data[1],
diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c
index 8ce2daff985c..f320ab27da46 100644
--- a/drivers/i2c/busses/i2c-sis5595.c
+++ b/drivers/i2c/busses/i2c-sis5595.c
@@ -365,7 +365,6 @@ static const struct i2c_algorithm smbus_algorithm = {
 
 static struct i2c_adapter sis5595_adapter = {
         .owner          = THIS_MODULE,
-        .id             = I2C_HW_SMBUS_SIS5595,
         .class          = I2C_CLASS_HWMON | I2C_CLASS_SPD,
         .algo           = &smbus_algorithm,
 };
diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c
index 9c9c016ff2b5..50c3610e6028 100644
--- a/drivers/i2c/busses/i2c-sis630.c
+++ b/drivers/i2c/busses/i2c-sis630.c
@@ -464,7 +464,6 @@ static const struct i2c_algorithm smbus_algorithm = {
 
 static struct i2c_adapter sis630_adapter = {
         .owner          = THIS_MODULE,
-        .id             = I2C_HW_SMBUS_SIS630,
         .class          = I2C_CLASS_HWMON | I2C_CLASS_SPD,
         .algo           = &smbus_algorithm,
 };
diff --git a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c
index f1bba6396641..7e1594b40579 100644
--- a/drivers/i2c/busses/i2c-sis96x.c
+++ b/drivers/i2c/busses/i2c-sis96x.c
@@ -241,7 +241,6 @@ static const struct i2c_algorithm smbus_algorithm = {
 
 static struct i2c_adapter sis96x_adapter = {
         .owner          = THIS_MODULE,
-        .id             = I2C_HW_SMBUS_SIS96X,
         .class          = I2C_CLASS_HWMON | I2C_CLASS_SPD,
         .algo           = &smbus_algorithm,
 };
diff --git a/drivers/i2c/busses/i2c-via.c b/drivers/i2c/busses/i2c-via.c
index 29cef0433f34..8b24f192103a 100644
--- a/drivers/i2c/busses/i2c-via.c
+++ b/drivers/i2c/busses/i2c-via.c
@@ -83,7 +83,6 @@ static struct i2c_algo_bit_data bit_data = {
 
 static struct i2c_adapter vt586b_adapter = {
         .owner          = THIS_MODULE,
-        .id             = I2C_HW_B_VIA,
         .class          = I2C_CLASS_HWMON | I2C_CLASS_SPD,
         .name           = "VIA i2c",
         .algo_data      = &bit_data,
diff --git a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c
index 9f194d9efd91..02e6f724b05f 100644
--- a/drivers/i2c/busses/i2c-viapro.c
+++ b/drivers/i2c/busses/i2c-viapro.c
@@ -321,7 +321,6 @@ static const struct i2c_algorithm smbus_algorithm = {
 
 static struct i2c_adapter vt596_adapter = {
         .owner          = THIS_MODULE,
-        .id             = I2C_HW_SMBUS_VIA2,
         .class          = I2C_CLASS_HWMON | I2C_CLASS_SPD,
         .algo           = &smbus_algorithm,
 };
diff --git a/drivers/i2c/busses/i2c-voodoo3.c b/drivers/i2c/busses/i2c-voodoo3.c
index 1d4ae26ba73d..1a474acc0ddd 100644
--- a/drivers/i2c/busses/i2c-voodoo3.c
+++ b/drivers/i2c/busses/i2c-voodoo3.c
@@ -163,7 +163,6 @@ static struct i2c_algo_bit_data voo_i2c_bit_data = {
 
 static struct i2c_adapter voodoo3_i2c_adapter = {
         .owner          = THIS_MODULE,
-        .id             = I2C_HW_B_VOO,
         .class          = I2C_CLASS_TV_ANALOG, 
         .name           = "I2C Voodoo3/Banshee adapter",
         .algo_data      = &voo_i2c_bit_data,
@@ -180,7 +179,6 @@ static struct i2c_algo_bit_data voo_ddc_bit_data = {
 
 static struct i2c_adapter voodoo3_ddc_adapter = {
         .owner          = THIS_MODULE,
-        .id             = I2C_HW_B_VOO,
         .class          = I2C_CLASS_DDC, 
         .name           = "DDC Voodoo3/Banshee adapter",
         .algo_data      = &voo_ddc_bit_data,
diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c
index ed794b145a11..648ecc6f60e6 100644
--- a/drivers/i2c/busses/scx200_acb.c
+++ b/drivers/i2c/busses/scx200_acb.c
@@ -440,7 +440,6 @@ static __init struct scx200_acb_iface *scx200_create_iface(const char *text,
         i2c_set_adapdata(adapter, iface);
         snprintf(adapter->name, sizeof(adapter->name), "%s ACB%d", text, index);
         adapter->owner = THIS_MODULE;
-        adapter->id = I2C_HW_SMBUS_SCX200;
         adapter->algo = &scx200_acb_algorithm;
         adapter->class = I2C_CLASS_HWMON | I2C_CLASS_SPD;
         adapter->dev.parent = dev;
diff --git a/drivers/i2c/busses/scx200_i2c.c b/drivers/i2c/busses/scx200_i2c.c
index e4c98539c517..162b74a04886 100644
--- a/drivers/i2c/busses/scx200_i2c.c
+++ b/drivers/i2c/busses/scx200_i2c.c
@@ -82,7 +82,6 @@ static struct i2c_algo_bit_data scx200_i2c_data = {
 static struct i2c_adapter scx200_i2c_ops = {
         .owner             = THIS_MODULE,
         .class             = I2C_CLASS_HWMON | I2C_CLASS_SPD,
-        .id                = I2C_HW_B_SCX200,
         .algo_data         = &scx200_i2c_data,
         .name   = "NatSemi SCx200 I2C",
 };
diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index 59c3d23f5bdc..c80312c1f382 100644
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -16,43 +16,6 @@ config DS1682
           This driver can also be built as a module.  If so, the module
           will be called ds1682.
 
-config AT24
-        tristate "EEPROMs from most vendors"
-        depends on SYSFS && EXPERIMENTAL
-        help
-          Enable this driver to get read/write support to most I2C EEPROMs,
-          after you configure the driver to know about each EEPROM on
-          your target board.  Use these generic chip names, instead of
-          vendor-specific ones like at24c64 or 24lc02:
-
-             24c00, 24c01, 24c02, spd (readonly 24c02), 24c04, 24c08,
-             24c16, 24c32, 24c64, 24c128, 24c256, 24c512, 24c1024
-
-          Unless you like data loss puzzles, always be sure that any chip
-          you configure as a 24c32 (32 kbit) or larger is NOT really a
-          24c16 (16 kbit) or smaller, and vice versa. Marking the chip
-          as read-only won't help recover from this. Also, if your chip
-          has any software write-protect mechanism you may want to review the
-          code to make sure this driver won't turn it on by accident.
-
-          If you use this with an SMBus adapter instead of an I2C adapter,
-          full functionality is not available.  Only smaller devices are
-          supported (24c16 and below, max 4 kByte).
-
-          This driver can also be built as a module.  If so, the module
-          will be called at24.
-
-config SENSORS_EEPROM
-        tristate "EEPROM reader"
-        depends on EXPERIMENTAL
-        help
-          If you say yes here you get read-only access to the EEPROM data
-          available on modern memory DIMMs and Sony Vaio laptops.  Such
-          EEPROMs could theoretically be available on other devices as well.
-
-          This driver can also be built as a module.  If so, the module
-          will be called eeprom.
-
 config SENSORS_PCF8574
         tristate "Philips PCF8574 and PCF8574A (DEPRECATED)"
         depends on EXPERIMENTAL && GPIO_PCF857X = "n"
@@ -139,15 +102,4 @@ config SENSORS_TSL2550
           This driver can also be built as a module.  If so, the module
           will be called tsl2550.
 
-config MCU_MPC8349EMITX
-        tristate "MPC8349E-mITX MCU driver"
-        depends on I2C && PPC_83xx
-        select GENERIC_GPIO
-        select ARCH_REQUIRE_GPIOLIB
-        help
-          Say Y here to enable soft power-off functionality on the Freescale
-          boards with the MPC8349E-mITX-compatible MCU chips. This driver will
-          also register MCU GPIOs with the generic GPIO API, so you'll able
-          to use MCU pins as GPIOs.
-
 endmenu
diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
index 83accaaf8164..d142f238a2de 100644
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@ -11,15 +11,12 @@
 #
 
 obj-$(CONFIG_DS1682)            += ds1682.o
-obj-$(CONFIG_AT24)              += at24.o
-obj-$(CONFIG_SENSORS_EEPROM)    += eeprom.o
 obj-$(CONFIG_SENSORS_MAX6875)   += max6875.o
 obj-$(CONFIG_SENSORS_PCA9539)   += pca9539.o
 obj-$(CONFIG_SENSORS_PCF8574)   += pcf8574.o
 obj-$(CONFIG_PCF8575)           += pcf8575.o
 obj-$(CONFIG_SENSORS_PCF8591)   += pcf8591.o
 obj-$(CONFIG_SENSORS_TSL2550)   += tsl2550.o
-obj-$(CONFIG_MCU_MPC8349EMITX)  += mcu_mpc8349emitx.o
 
 ifeq ($(CONFIG_I2C_DEBUG_CHIP),y)
 EXTRA_CFLAGS += -DDEBUG
diff --git a/drivers/i2c/chips/at24.c b/drivers/i2c/chips/at24.c
deleted file mode 100644
index d4775528abc6..000000000000
--- a/drivers/i2c/chips/at24.c
+++ /dev/null
@@ -1,582 +0,0 @@
-/*
- * at24.c - handle most I2C EEPROMs
- *
- * Copyright (C) 2005-2007 David Brownell
- * Copyright (C) 2008 Wolfram Sang, Pengutronix
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-#include <linux/mutex.h>
-#include <linux/sysfs.h>
-#include <linux/mod_devicetable.h>
-#include <linux/log2.h>
-#include <linux/bitops.h>
-#include <linux/jiffies.h>
-#include <linux/i2c.h>
-#include <linux/i2c/at24.h>
-
-/*
- * I2C EEPROMs from most vendors are inexpensive and mostly interchangeable.
- * Differences between different vendor product lines (like Atmel AT24C or
- * MicroChip 24LC, etc) won't much matter for typical read/write access.
- * There are also I2C RAM chips, likewise interchangeable. One example
- * would be the PCF8570, which acts like a 24c02 EEPROM (256 bytes).
- *
- * However, misconfiguration can lose data. "Set 16-bit memory address"
- * to a part with 8-bit addressing will overwrite data. Writing with too
- * big a page size also loses data. And it's not safe to assume that the
- * conventional addresses 0x50..0x57 only hold eeproms; a PCF8563 RTC
- * uses 0x51, for just one example.
- *
- * Accordingly, explicit board-specific configuration data should be used
- * in almost all cases. (One partial exception is an SMBus used to access
- * "SPD" data for DRAM sticks. Those only use 24c02 EEPROMs.)
- *
- * So this driver uses "new style" I2C driver binding, expecting to be
- * told what devices exist. That may be in arch/X/mach-Y/board-Z.c or
- * similar kernel-resident tables; or, configuration data coming from
- * a bootloader.
- *
- * Other than binding model, current differences from "eeprom" driver are
- * that this one handles write access and isn't restricted to 24c02 devices.
- * It also handles larger devices (32 kbit and up) with two-byte addresses,
- * which won't work on pure SMBus systems.
- */
-
-struct at24_data {
-        struct at24_platform_data chip;
-        bool use_smbus;
-
-        /*
-         * Lock protects against activities from other Linux tasks,
-         * but not from changes by other I2C masters.
-         */
-        struct mutex lock;
-        struct bin_attribute bin;
-
-        u8 *writebuf;
-        unsigned write_max;
-        unsigned num_addresses;
-
-        /*
-         * Some chips tie up multiple I2C addresses; dummy devices reserve
-         * them for us, and we'll use them with SMBus calls.
-         */
-        struct i2c_client *client[];
-};
-
-/*
- * This parameter is to help this driver avoid blocking other drivers out
- * of I2C for potentially troublesome amounts of time. With a 100 kHz I2C
- * clock, one 256 byte read takes about 1/43 second which is excessive;
- * but the 1/170 second it takes at 400 kHz may be quite reasonable; and
- * at 1 MHz (Fm+) a 1/430 second delay could easily be invisible.
- *
- * This value is forced to be a power of two so that writes align on pages.
- */
-static unsigned io_limit = 128;
-module_param(io_limit, uint, 0);
-MODULE_PARM_DESC(io_limit, "Maximum bytes per I/O (default 128)");
-
-/*
- * Specs often allow 5 msec for a page write, sometimes 20 msec;
- * it's important to recover from write timeouts.
- */
-static unsigned write_timeout = 25;
-module_param(write_timeout, uint, 0);
-MODULE_PARM_DESC(write_timeout, "Time (in ms) to try writes (default 25)");
-
-#define AT24_SIZE_BYTELEN 5
-#define AT24_SIZE_FLAGS 8
-
-#define AT24_BITMASK(x) (BIT(x) - 1)
-
-/* create non-zero magic value for given eeprom parameters */
-#define AT24_DEVICE_MAGIC(_len, _flags)                 \
-        ((1 << AT24_SIZE_FLAGS | (_flags))              \
-            << AT24_SIZE_BYTELEN | ilog2(_len))
-
-static const struct i2c_device_id at24_ids[] = {
-        /* needs 8 addresses as A0-A2 are ignored */
-        { "24c00", AT24_DEVICE_MAGIC(128 / 8, AT24_FLAG_TAKE8ADDR) },
-        /* old variants can't be handled with this generic entry! */
-        { "24c01", AT24_DEVICE_MAGIC(1024 / 8, 0) },
-        { "24c02", AT24_DEVICE_MAGIC(2048 / 8, 0) },
-        /* spd is a 24c02 in memory DIMMs */
-        { "spd", AT24_DEVICE_MAGIC(2048 / 8,
-                AT24_FLAG_READONLY | AT24_FLAG_IRUGO) },
-        { "24c04", AT24_DEVICE_MAGIC(4096 / 8, 0) },
-        /* 24rf08 quirk is handled at i2c-core */
-        { "24c08", AT24_DEVICE_MAGIC(8192 / 8, 0) },
-        { "24c16", AT24_DEVICE_MAGIC(16384 / 8, 0) },
-        { "24c32", AT24_DEVICE_MAGIC(32768 / 8, AT24_FLAG_ADDR16) },
-        { "24c64", AT24_DEVICE_MAGIC(65536 / 8, AT24_FLAG_ADDR16) },
-        { "24c128", AT24_DEVICE_MAGIC(131072 / 8, AT24_FLAG_ADDR16) },
-        { "24c256", AT24_DEVICE_MAGIC(262144 / 8, AT24_FLAG_ADDR16) },
-        { "24c512", AT24_DEVICE_MAGIC(524288 / 8, AT24_FLAG_ADDR16) },
-        { "24c1024", AT24_DEVICE_MAGIC(1048576 / 8, AT24_FLAG_ADDR16) },
-        { "at24", 0 },
-        { /* END OF LIST */ }
-};
-MODULE_DEVICE_TABLE(i2c, at24_ids);
-
-/*-------------------------------------------------------------------------*/
-
-/*
- * This routine supports chips which consume multiple I2C addresses. It
- * computes the addressing information to be used for a given r/w request.
- * Assumes that sanity checks for offset happened at sysfs-layer.
- */
-static struct i2c_client *at24_translate_offset(struct at24_data *at24,
-                unsigned *offset)
-{
-        unsigned i;
-
-        if (at24->chip.flags & AT24_FLAG_ADDR16) {
-                i = *offset >> 16;
-                *offset &= 0xffff;
-        } else {
-                i = *offset >> 8;
-                *offset &= 0xff;
-        }
-
-        return at24->client[i];
-}
-
-static ssize_t at24_eeprom_read(struct at24_data *at24, char *buf,
-                unsigned offset, size_t count)
-{
-        struct i2c_msg msg[2];
-        u8 msgbuf[2];
-        struct i2c_client *client;
-        int status, i;
-
-        memset(msg, 0, sizeof(msg));
-
-        /*
-         * REVISIT some multi-address chips don't rollover page reads to
-         * the next slave address, so we may need to truncate the count.
-         * Those chips might need another quirk flag.
-         *
-         * If the real hardware used four adjacent 24c02 chips and that
-         * were misconfigured as one 24c08, that would be a similar effect:
-         * one "eeprom" file not four, but larger reads would fail when
-         * they crossed certain pages.
-         */
-
-        /*
-         * Slave address and byte offset derive from the offset. Always
-         * set the byte address; on a multi-master board, another master
-         * may have changed the chip's "current" address pointer.
-         */
-        client = at24_translate_offset(at24, &offset);
-
-        if (count > io_limit)
-                count = io_limit;
-
-        /* Smaller eeproms can work given some SMBus extension calls */
-        if (at24->use_smbus) {
-                if (count > I2C_SMBUS_BLOCK_MAX)
-                        count = I2C_SMBUS_BLOCK_MAX;
-                status = i2c_smbus_read_i2c_block_data(client, offset,
-                                count, buf);
-                dev_dbg(&client->dev, "smbus read %zu@%d --> %d\n",
-                                count, offset, status);
-                return (status < 0) ? -EIO : status;
-        }
-
-        /*
-         * When we have a better choice than SMBus calls, use a combined
-         * I2C message. Write address; then read up to io_limit data bytes.
-         * Note that read page rollover helps us here (unlike writes).
-         * msgbuf is u8 and will cast to our needs.
-         */
-        i = 0;
-        if (at24->chip.flags & AT24_FLAG_ADDR16)
-                msgbuf[i++] = offset >> 8;
-        msgbuf[i++] = offset;
-
-        msg[0].addr = client->addr;
-        msg[0].buf = msgbuf;
-        msg[0].len = i;
-
-        msg[1].addr = client->addr;
-        msg[1].flags = I2C_M_RD;
-        msg[1].buf = buf;
-        msg[1].len = count;
-
-        status = i2c_transfer(client->adapter, msg, 2);
-        dev_dbg(&client->dev, "i2c read %zu@%d --> %d\n",
-                        count, offset, status);
-
-        if (status == 2)
-                return count;
-        else if (status >= 0)
-                return -EIO;
-        else
-                return status;
-}
-
-static ssize_t at24_bin_read(struct kobject *kobj, struct bin_attribute *attr,
-                char *buf, loff_t off, size_t count)
-{
-        struct at24_data *at24;
-        ssize_t retval = 0;
-
-        at24 = dev_get_drvdata(container_of(kobj, struct device, kobj));
-
-        if (unlikely(!count))
-                return count;
-
-        /*
-         * Read data from chip, protecting against concurrent updates
-         * from this host, but not from other I2C masters.
-         */
-        mutex_lock(&at24->lock);
-
-        while (count) {
-                ssize_t status;
-
-                status = at24_eeprom_read(at24, buf, off, count);
-                if (status <= 0) {
-                        if (retval == 0)
-                                retval = status;
-                        break;
-                }
-                buf += status;
-                off += status;
-                count -= status;
-                retval += status;
-        }
-
-        mutex_unlock(&at24->lock);
-
-        return retval;
-}
-
-
-/*
- * REVISIT: export at24_bin{read,write}() to let other kernel code use
- * eeprom data. For example, it might hold a board's Ethernet address, or
- * board-specific calibration data generated on the manufacturing floor.
- */
-
-
-/*
- * Note that if the hardware write-protect pin is pulled high, the whole
- * chip is normally write protected. But there are plenty of product
- * variants here, including OTP fuses and partial chip protect.
- *
- * We only use page mode writes; the alternative is sloooow. This routine
- * writes at most one page.
- */
-static ssize_t at24_eeprom_write(struct at24_data *at24, char *buf,
-                unsigned offset, size_t count)
-{
-        struct i2c_client *client;
-        struct i2c_msg msg;
-        ssize_t status;
-        unsigned long timeout, write_time;
-        unsigned next_page;
-
-        /* Get corresponding I2C address and adjust offset */
-        client = at24_translate_offset(at24, &offset);
-
-        /* write_max is at most a page */
-        if (count > at24->write_max)
-                count = at24->write_max;
-
-        /* Never roll over backwards, to the start of this page */
-        next_page = roundup(offset + 1, at24->chip.page_size);
-        if (offset + count > next_page)
-                count = next_page - offset;
-
-        /* If we'll use I2C calls for I/O, set up the message */
-        if (!at24->use_smbus) {
-                int i = 0;
-
-                msg.addr = client->addr;
-                msg.flags = 0;
-
-                /* msg.buf is u8 and casts will mask the values */
-                msg.buf = at24->writebuf;
-                if (at24->chip.flags & AT24_FLAG_ADDR16)
-                        msg.buf[i++] = offset >> 8;
-
-                msg.buf[i++] = offset;
-                memcpy(&msg.buf[i], buf, count);
-                msg.len = i + count;
-        }
-
-        /*
-         * Writes fail if the previous one didn't complete yet. We may
-         * loop a few times until this one succeeds, waiting at least
-         * long enough for one entire page write to work.
-         */
-        timeout = jiffies + msecs_to_jiffies(write_timeout);
-        do {
-                write_time = jiffies;
-                if (at24->use_smbus) {
-                        status = i2c_smbus_write_i2c_block_data(client,
-                                        offset, count, buf);
-                        if (status == 0)
-                                status = count;
-                } else {
-                        status = i2c_transfer(client->adapter, &msg, 1);
-                        if (status == 1)
-                                status = count;
-                }
-                dev_dbg(&client->dev, "write %zu@%d --> %zd (%ld)\n",
-                                count, offset, status, jiffies);
-
-                if (status == count)
-                        return count;
-
-                /* REVISIT: at HZ=100, this is sloooow */
-                msleep(1);
-        } while (time_before(write_time, timeout));
-
-        return -ETIMEDOUT;
-}
-
-static ssize_t at24_bin_write(struct kobject *kobj, struct bin_attribute *attr,
-                char *buf, loff_t off, size_t count)
-{
-        struct at24_data *at24;
-        ssize_t retval = 0;
-
-        at24 = dev_get_drvdata(container_of(kobj, struct device, kobj));
-
-        if (unlikely(!count))
-                return count;
-
-        /*
-         * Write data to chip, protecting against concurrent updates
-         * from this host, but not from other I2C masters.
-         */
-        mutex_lock(&at24->lock);
-
-        while (count) {
-                ssize_t status;
-
-                status = at24_eeprom_write(at24, buf, off, count);
-                if (status <= 0) {
-                        if (retval == 0)
-                                retval = status;
-                        break;
-                }
-                buf += status;
-                off += status;
-                count -= status;
-                retval += status;
-        }
-
-        mutex_unlock(&at24->lock);
-
-        return retval;
-}
-
-/*-------------------------------------------------------------------------*/
-
-static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
-{
-        struct at24_platform_data chip;
-        bool writable;
-        bool use_smbus = false;
-        struct at24_data *at24;
-        int err;
-        unsigned i, num_addresses;
-        kernel_ulong_t magic;
-
-        if (client->dev.platform_data) {
-                chip = *(struct at24_platform_data *)client->dev.platform_data;
-        } else {
-                if (!id->driver_data) {
-                        err = -ENODEV;
-                        goto err_out;
-                }
-                magic = id->driver_data;
-                chip.byte_len = BIT(magic & AT24_BITMASK(AT24_SIZE_BYTELEN));
-                magic >>= AT24_SIZE_BYTELEN;
-                chip.flags = magic & AT24_BITMASK(AT24_SIZE_FLAGS);
-                /*
-                 * This is slow, but we can't know all eeproms, so we better
-                 * play safe. Specifying custom eeprom-types via platform_data
-                 * is recommended anyhow.
-                 */
-                chip.page_size = 1;
-        }
-
-        if (!is_power_of_2(chip.byte_len))
-                dev_warn(&client->dev,
-                        "byte_len looks suspicious (no power of 2)!\n");
-        if (!is_power_of_2(chip.page_size))
-                dev_warn(&client->dev,
-                        "page_size looks suspicious (no power of 2)!\n");
-
-        /* Use I2C operations unless we're stuck with SMBus extensions. */
-        if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
-                if (chip.flags & AT24_FLAG_ADDR16) {
-                        err = -EPFNOSUPPORT;
-                        goto err_out;
-                }
-                if (!i2c_check_functionality(client->adapter,
-                                I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
-                        err = -EPFNOSUPPORT;
-                        goto err_out;
-                }
-                use_smbus = true;
-        }
-
-        if (chip.flags & AT24_FLAG_TAKE8ADDR)
-                num_addresses = 8;
-        else
-                num_addresses = DIV_ROUND_UP(chip.byte_len,
-                        (chip.flags & AT24_FLAG_ADDR16) ? 65536 : 256);
-
-        at24 = kzalloc(sizeof(struct at24_data) +
-                num_addresses * sizeof(struct i2c_client *), GFP_KERNEL);
-        if (!at24) {
-                err = -ENOMEM;
-                goto err_out;
-        }
-
-        mutex_init(&at24->lock);
-        at24->use_smbus = use_smbus;
-        at24->chip = chip;
-        at24->num_addresses = num_addresses;
-
-        /*
-         * Export the EEPROM bytes through sysfs, since that's convenient.
-         * By default, only root should see the data (maybe passwords etc)
-         */
-        at24->bin.attr.name = "eeprom";
-        at24->bin.attr.mode = chip.flags & AT24_FLAG_IRUGO ? S_IRUGO : S_IRUSR;
-        at24->bin.read = at24_bin_read;
-        at24->bin.size = chip.byte_len;
-
-        writable = !(chip.flags & AT24_FLAG_READONLY);
-        if (writable) {
-                if (!use_smbus || i2c_check_functionality(client->adapter,
-                                I2C_FUNC_SMBUS_WRITE_I2C_BLOCK)) {
-
-                        unsigned write_max = chip.page_size;
-
-                        at24->bin.write = at24_bin_write;
-                        at24->bin.attr.mode |= S_IWUSR;
-
-                        if (write_max > io_limit)
-                                write_max = io_limit;
-                        if (use_smbus && write_max > I2C_SMBUS_BLOCK_MAX)
-                                write_max = I2C_SMBUS_BLOCK_MAX;
-                        at24->write_max = write_max;
-
-                        /* buffer (data + address at the beginning) */
-                        at24->writebuf = kmalloc(write_max + 2, GFP_KERNEL);
-                        if (!at24->writebuf) {
-                                err = -ENOMEM;
-                                goto err_struct;
-                        }
-                } else {
-                        dev_warn(&client->dev,
-                                "cannot write due to controller restrictions.");
-                }
-        }
-
-        at24->client[0] = client;
-
-        /* use dummy devices for multiple-address chips */
-        for (i = 1; i < num_addresses; i++) {
-                at24->client[i] = i2c_new_dummy(client->adapter,
-                                        client->addr + i);
-                if (!at24->client[i]) {
-                        dev_err(&client->dev, "address 0x%02x unavailable\n",
-                                        client->addr + i);
-                        err = -EADDRINUSE;
-                        goto err_clients;
-                }
-        }
-
-        err = sysfs_create_bin_file(&client->dev.kobj, &at24->bin);
-        if (err)
-                goto err_clients;
-
-        i2c_set_clientdata(client, at24);
-
-        dev_info(&client->dev, "%zu byte %s EEPROM %s\n",
-                at24->bin.size, client->name,
-                writable ? "(writable)" : "(read-only)");
-        dev_dbg(&client->dev,
-                "page_size %d, num_addresses %d, write_max %d%s\n",
-                chip.page_size, num_addresses,
-                at24->write_max,
-                use_smbus ? ", use_smbus" : "");
-
-        return 0;
-
-err_clients:
-        for (i = 1; i < num_addresses; i++)
-                if (at24->client[i])
-                        i2c_unregister_device(at24->client[i]);
-
-        kfree(at24->writebuf);
-err_struct:
-        kfree(at24);
-err_out:
-        dev_dbg(&client->dev, "probe error %d\n", err);
-        return err;
-}
-
-static int __devexit at24_remove(struct i2c_client *client)
-{
-        struct at24_data *at24;
-        int i;
-
-        at24 = i2c_get_clientdata(client);
-        sysfs_remove_bin_file(&client->dev.kobj, &at24->bin);
-
-        for (i = 1; i < at24->num_addresses; i++)
-                i2c_unregister_device(at24->client[i]);
-
-        kfree(at24->writebuf);
-        kfree(at24);
-        i2c_set_clientdata(client, NULL);
-        return 0;
-}
-
-/*-------------------------------------------------------------------------*/
-
-static struct i2c_driver at24_driver = {
-        .driver = {
-                .name = "at24",
-                .owner = THIS_MODULE,
-        },
-        .probe = at24_probe,
-        .remove = __devexit_p(at24_remove),
-        .id_table = at24_ids,
-};
-
-static int __init at24_init(void)
-{
-        io_limit = rounddown_pow_of_two(io_limit);
-        return i2c_add_driver(&at24_driver);
-}
-module_init(at24_init);
-
-static void __exit at24_exit(void)
-{
-        i2c_del_driver(&at24_driver);
-}
-module_exit(at24_exit);
-
-MODULE_DESCRIPTION("Driver for most I2C EEPROMs");
-MODULE_AUTHOR("David Brownell and Wolfram Sang");
-MODULE_LICENSE("GPL");
diff --git a/drivers/i2c/chips/eeprom.c b/drivers/i2c/chips/eeprom.c
deleted file mode 100644
index 2c27193aeaa0..000000000000
--- a/drivers/i2c/chips/eeprom.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
-    Copyright (C) 1998, 1999  Frodo Looijaard <frodol@dds.nl> and
-                               Philip Edelbrock <phil@netroedge.com>
-    Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
-    Copyright (C) 2003 IBM Corp.
-    Copyright (C) 2004 Jean Delvare <khali@linux-fr.org>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    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., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/jiffies.h>
-#include <linux/i2c.h>
-#include <linux/mutex.h>
-
-/* Addresses to scan */
-static const unsigned short normal_i2c[] = { 0x50, 0x51, 0x52, 0x53, 0x54,
-                                        0x55, 0x56, 0x57, I2C_CLIENT_END };
-
-/* Insmod parameters */
-I2C_CLIENT_INSMOD_1(eeprom);
-
-
-/* Size of EEPROM in bytes */
-#define EEPROM_SIZE             256
-
-/* possible types of eeprom devices */
-enum eeprom_nature {
-        UNKNOWN,
-        VAIO,
-};
-
-/* Each client has this additional data */
-struct eeprom_data {
-        struct mutex update_lock;
-        u8 valid;                       /* bitfield, bit!=0 if slice is valid */
-        unsigned long last_updated[8];  /* In jiffies, 8 slices */
-        u8 data[EEPROM_SIZE];           /* Register values */
-        enum eeprom_nature nature;
-};
-
-
-static void eeprom_update_client(struct i2c_client *client, u8 slice)
-{
-        struct eeprom_data *data = i2c_get_clientdata(client);
-        int i;
-
-        mutex_lock(&data->update_lock);
-
-        if (!(data->valid & (1 << slice)) ||
-            time_after(jiffies, data->last_updated[slice] + 300 * HZ)) {
-                dev_dbg(&client->dev, "Starting eeprom update, slice %u\n", slice);
-
-                if (i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
-                        for (i = slice << 5; i < (slice + 1) << 5; i += 32)
-                                if (i2c_smbus_read_i2c_block_data(client, i,
-                                                        32, data->data + i)
-                                                        != 32)
-                                        goto exit;
-                } else {
-                        for (i = slice << 5; i < (slice + 1) << 5; i += 2) {
-                                int word = i2c_smbus_read_word_data(client, i);
-                                if (word < 0)
-                                        goto exit;
-                                data->data[i] = word & 0xff;
-                                data->data[i + 1] = word >> 8;
-                        }
-                }
-                data->last_updated[slice] = jiffies;
-                data->valid |= (1 << slice);
-        }
-exit:
-        mutex_unlock(&data->update_lock);
-}
-
-static ssize_t eeprom_read(struct kobject *kobj, struct bin_attribute *bin_attr,
-                           char *buf, loff_t off, size_t count)
-{
-        struct i2c_client *client = to_i2c_client(container_of(kobj, struct device, kobj));
-        struct eeprom_data *data = i2c_get_clientdata(client);
-        u8 slice;
-
-        if (off > EEPROM_SIZE)
-                return 0;
-        if (off + count > EEPROM_SIZE)
-                count = EEPROM_SIZE - off;
-
-        /* Only refresh slices which contain requested bytes */
-        for (slice = off >> 5; slice <= (off + count - 1) >> 5; slice++)
-                eeprom_update_client(client, slice);
-
-        /* Hide Vaio private settings to regular users:
-           - BIOS passwords: bytes 0x00 to 0x0f
-           - UUID: bytes 0x10 to 0x1f
-           - Serial number: 0xc0 to 0xdf */
-        if (data->nature == VAIO && !capable(CAP_SYS_ADMIN)) {
-                int i;
-
-                for (i = 0; i < count; i++) {
-                        if ((off + i <= 0x1f) ||
-                            (off + i >= 0xc0 && off + i <= 0xdf))
-                                buf[i] = 0;
-                        else
-                                buf[i] = data->data[off + i];
-                }
-        } else {
-                memcpy(buf, &data->data[off], count);
-        }
-
-        return count;
-}
-
-static struct bin_attribute eeprom_attr = {
-        .attr = {
-                .name = "eeprom",
-                .mode = S_IRUGO,
-        },
-        .size = EEPROM_SIZE,
-        .read = eeprom_read,
-};
-
-/* Return 0 if detection is successful, -ENODEV otherwise */
-static int eeprom_detect(struct i2c_client *client, int kind,
-                         struct i2c_board_info *info)
-{
-        struct i2c_adapter *adapter = client->adapter;
-
-        /* EDID EEPROMs are often 24C00 EEPROMs, which answer to all
-           addresses 0x50-0x57, but we only care about 0x50. So decline
-           attaching to addresses >= 0x51 on DDC buses */
-        if (!(adapter->class & I2C_CLASS_SPD) && client->addr >= 0x51)
-                return -ENODEV;
-
-        /* There are four ways we can read the EEPROM data:
-           (1) I2C block reads (faster, but unsupported by most adapters)
-           (2) Word reads (128% overhead)
-           (3) Consecutive byte reads (88% overhead, unsafe)
-           (4) Regular byte data reads (265% overhead)
-           The third and fourth methods are not implemented by this driver
-           because all known adapters support one of the first two. */
-        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_READ_WORD_DATA)
-         && !i2c_check_functionality(adapter, I2C_FUNC_SMBUS_READ_I2C_BLOCK))
-                return -ENODEV;
-
-        strlcpy(info->type, "eeprom", I2C_NAME_SIZE);
-
-        return 0;
-}
-
-static int eeprom_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
-{
-        struct i2c_adapter *adapter = client->adapter;
-        struct eeprom_data *data;
-        int err;
-
-        if (!(data = kzalloc(sizeof(struct eeprom_data), GFP_KERNEL))) {
-                err = -ENOMEM;
-                goto exit;
-        }
-
-        memset(data->data, 0xff, EEPROM_SIZE);
-        i2c_set_clientdata(client, data);
-        mutex_init(&data->update_lock);
-        data->nature = UNKNOWN;
-
-        /* Detect the Vaio nature of EEPROMs.
-           We use the "PCG-" or "VGN-" prefix as the signature. */
-        if (client->addr == 0x57
-         && i2c_check_functionality(adapter, I2C_FUNC_SMBUS_READ_BYTE_DATA)) {
-                char name[4];
-
-                name[0] = i2c_smbus_read_byte_data(client, 0x80);
-                name[1] = i2c_smbus_read_byte_data(client, 0x81);
-                name[2] = i2c_smbus_read_byte_data(client, 0x82);
-                name[3] = i2c_smbus_read_byte_data(client, 0x83);
-
-                if (!memcmp(name, "PCG-", 4) || !memcmp(name, "VGN-", 4)) {
-                        dev_info(&client->dev, "Vaio EEPROM detected, "
-                                 "enabling privacy protection\n");
-                        data->nature = VAIO;
-                }
-        }
-
-        /* create the sysfs eeprom file */
-        err = sysfs_create_bin_file(&client->dev.kobj, &eeprom_attr);
-        if (err)
-                goto exit_kfree;
-
-        return 0;
-
-exit_kfree:
-        kfree(data);
-exit:
-        return err;
-}
-
-static int eeprom_remove(struct i2c_client *client)
-{
-        sysfs_remove_bin_file(&client->dev.kobj, &eeprom_attr);
-        kfree(i2c_get_clientdata(client));
-
-        return 0;
-}
-
-static const struct i2c_device_id eeprom_id[] = {
-        { "eeprom", 0 },
-        { }
-};
-
-static struct i2c_driver eeprom_driver = {
-        .driver = {
-                .name   = "eeprom",
-        },
-        .probe          = eeprom_probe,
-        .remove         = eeprom_remove,
-        .id_table       = eeprom_id,
-
-        .class          = I2C_CLASS_DDC | I2C_CLASS_SPD,
-        .detect         = eeprom_detect,
-        .address_data   = &addr_data,
-};
-
-static int __init eeprom_init(void)
-{
-        return i2c_add_driver(&eeprom_driver);
-}
-
-static void __exit eeprom_exit(void)
-{
-        i2c_del_driver(&eeprom_driver);
-}
-
-
-MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl> and "
-                "Philip Edelbrock <phil@netroedge.com> and "
-                "Greg Kroah-Hartman <greg@kroah.com>");
-MODULE_DESCRIPTION("I2C EEPROM driver");
-MODULE_LICENSE("GPL");
-
-module_init(eeprom_init);
-module_exit(eeprom_exit);
diff --git a/drivers/i2c/chips/mcu_mpc8349emitx.c b/drivers/i2c/chips/mcu_mpc8349emitx.c
deleted file mode 100644
index 82a9bcb858b6..000000000000
--- a/drivers/i2c/chips/mcu_mpc8349emitx.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Power Management and GPIO expander driver for MPC8349E-mITX-compatible MCU
- *
- * Copyright (c) 2008  MontaVista Software, Inc.
- *
- * Author: Anton Vorontsov <avorontsov@ru.mvista.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/device.h>
-#include <linux/mutex.h>
-#include <linux/i2c.h>
-#include <linux/gpio.h>
-#include <linux/of.h>
-#include <linux/of_gpio.h>
-#include <asm/prom.h>
-#include <asm/machdep.h>
-
-/*
- * I don't have specifications for the MCU firmware, I found this register
- * and bits positions by the trial&error method.
- */
-#define MCU_REG_CTRL    0x20
-#define MCU_CTRL_POFF   0x40
-
-#define MCU_NUM_GPIO    2
-
-struct mcu {
-        struct mutex lock;
-        struct device_node *np;
-        struct i2c_client *client;
-        struct of_gpio_chip of_gc;
-        u8 reg_ctrl;
-};
-
-static struct mcu *glob_mcu;
-
-static void mcu_power_off(void)
-{
-        struct mcu *mcu = glob_mcu;
-
-        pr_info("Sending power-off request to the MCU...\n");
-        mutex_lock(&mcu->lock);
-        i2c_smbus_write_byte_data(glob_mcu->client, MCU_REG_CTRL,
-                                  mcu->reg_ctrl | MCU_CTRL_POFF);
-        mutex_unlock(&mcu->lock);
-}
-
-static void mcu_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
-{
-        struct of_gpio_chip *of_gc = to_of_gpio_chip(gc);
-        struct mcu *mcu = container_of(of_gc, struct mcu, of_gc);
-        u8 bit = 1 << (4 + gpio);
-
-        mutex_lock(&mcu->lock);
-        if (val)
-                mcu->reg_ctrl &= ~bit;
-        else
-                mcu->reg_ctrl |= bit;
-
-        i2c_smbus_write_byte_data(mcu->client, MCU_REG_CTRL, mcu->reg_ctrl);
-        mutex_unlock(&mcu->lock);
-}
-
-static int mcu_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
-{
-        mcu_gpio_set(gc, gpio, val);
-        return 0;
-}
-
-static int mcu_gpiochip_add(struct mcu *mcu)
-{
-        struct device_node *np;
-        struct of_gpio_chip *of_gc = &mcu->of_gc;
-        struct gpio_chip *gc = &of_gc->gc;
-        int ret;
-
-        np = of_find_compatible_node(NULL, NULL, "fsl,mcu-mpc8349emitx");
-        if (!np)
-                return -ENODEV;
-
-        gc->owner = THIS_MODULE;
-        gc->label = np->full_name;
-        gc->can_sleep = 1;
-        gc->ngpio = MCU_NUM_GPIO;
-        gc->base = -1;
-        gc->set = mcu_gpio_set;
-        gc->direction_output = mcu_gpio_dir_out;
-        of_gc->gpio_cells = 2;
-        of_gc->xlate = of_gpio_simple_xlate;
-
-        np->data = of_gc;
-        mcu->np = np;
-
-        /*
-         * We don't want to lose the node, its ->data and ->full_name...
-         * So, if succeeded, we don't put the node here.
-         */
-        ret = gpiochip_add(gc);
-        if (ret)
-                of_node_put(np);
-        return ret;
-}
-
-static int mcu_gpiochip_remove(struct mcu *mcu)
-{
-        int ret;
-
-        ret = gpiochip_remove(&mcu->of_gc.gc);
-        if (ret)
-                return ret;
-        of_node_put(mcu->np);
-
-        return 0;
-}
-
-static int __devinit mcu_probe(struct i2c_client *client,
-                               const struct i2c_device_id *id)
-{
-        struct mcu *mcu;
-        int ret;
-
-        mcu = kzalloc(sizeof(*mcu), GFP_KERNEL);
-        if (!mcu)
-                return -ENOMEM;
-
-        mutex_init(&mcu->lock);
-        mcu->client = client;
-        i2c_set_clientdata(client, mcu);
-
-        ret = i2c_smbus_read_byte_data(mcu->client, MCU_REG_CTRL);
-        if (ret < 0)
-                goto err;
-        mcu->reg_ctrl = ret;
-
-        ret = mcu_gpiochip_add(mcu);
-        if (ret)
-                goto err;
-
-        /* XXX: this is potentially racy, but there is no lock for ppc_md */
-        if (!ppc_md.power_off) {
-                glob_mcu = mcu;
-                ppc_md.power_off = mcu_power_off;
-                dev_info(&client->dev, "will provide power-off service\n");
-        }
-
-        return 0;
-err:
-        kfree(mcu);
-        return ret;
-}
-
-static int __devexit mcu_remove(struct i2c_client *client)
-{
-        struct mcu *mcu = i2c_get_clientdata(client);
-        int ret;
-
-        if (glob_mcu == mcu) {
-                ppc_md.power_off = NULL;
-                glob_mcu = NULL;
-        }
-
-        ret = mcu_gpiochip_remove(mcu);
-        if (ret)
-                return ret;
-        i2c_set_clientdata(client, NULL);
-        kfree(mcu);
-        return 0;
-}
-
-static const struct i2c_device_id mcu_ids[] = {
-        { "mcu-mpc8349emitx", },
-        {},
-};
-MODULE_DEVICE_TABLE(i2c, mcu_ids);
-
-static struct i2c_driver mcu_driver = {
-        .driver = {
-                .name = "mcu-mpc8349emitx",
-                .owner = THIS_MODULE,
-        },
-        .probe = mcu_probe,
-        .remove = __devexit_p(mcu_remove),
-        .id_table = mcu_ids,
-};
-
-static int __init mcu_init(void)
-{
-        return i2c_add_driver(&mcu_driver);
-}
-module_init(mcu_init);
-
-static void __exit mcu_exit(void)
-{
-        i2c_del_driver(&mcu_driver);
-}
-module_exit(mcu_exit);
-
-MODULE_DESCRIPTION("Power Management and GPIO expander driver for "
-                   "MPC8349E-mITX-compatible MCU");
-MODULE_AUTHOR("Anton Vorontsov <avorontsov@ru.mvista.com>");
-MODULE_LICENSE("GPL");