Patched in Tegra support.

7 files changed, 76 insertions, 195 deletions

diff --git a/drivers/misc/eeprom/Kconfig b/drivers/misc/eeprom/Kconfig
index c9e695ea7c9..26cf12ca7f5 100644
--- a/drivers/misc/eeprom/Kconfig
+++ b/drivers/misc/eeprom/Kconfig
@@ -50,7 +50,7 @@ config EEPROM_LEGACY
 
 config EEPROM_MAX6875
         tristate "Maxim MAX6874/5 power supply supervisor"
-        depends on I2C
+        depends on I2C && EXPERIMENTAL
         help
           If you say yes here you get read-only support for the user EEPROM of
           the Maxim MAX6874/5 EEPROM-programmable, quad power-supply
@@ -85,7 +85,7 @@ config EEPROM_93XX46
 
 config EEPROM_DIGSY_MTC_CFG
         bool "DigsyMTC display configuration EEPROMs device"
-        depends on GPIO_MPC5200 && SPI_GPIO
+        depends on PPC_MPC5200_GPIO && GPIOLIB && SPI_GPIO
         help
           This option enables access to display configuration EEPROMs
           on digsy_mtc board. You have to additionally select Microwire
diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
index 2baeec56edf..ab1ad41786d 100644
--- a/drivers/misc/eeprom/at24.c
+++ b/drivers/misc/eeprom/at24.c
@@ -656,7 +656,7 @@ err_out:
         return err;
 }
 
-static int at24_remove(struct i2c_client *client)
+static int __devexit at24_remove(struct i2c_client *client)
 {
         struct at24_data *at24;
         int i;
@@ -680,7 +680,7 @@ static struct i2c_driver at24_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = at24_probe,
-        .remove = at24_remove,
+        .remove = __devexit_p(at24_remove),
         .id_table = at24_ids,
 };
 
diff --git a/drivers/misc/eeprom/at25.c b/drivers/misc/eeprom/at25.c
index b08cf8a0878..c627e4174cc 100644
--- a/drivers/misc/eeprom/at25.c
+++ b/drivers/misc/eeprom/at25.c
@@ -19,7 +19,7 @@
 
 #include <linux/spi/spi.h>
 #include <linux/spi/eeprom.h>
-#include <linux/of.h>
+
 
 /*
  * NOTE: this is an *EEPROM* driver.  The vagaries of product naming
@@ -50,7 +50,6 @@ struct at25_data {
 #define AT25_SR_BP1     0x08
 #define AT25_SR_WPEN    0x80            /* writeprotect enable */
 
-#define AT25_INSTR_BIT3 0x08            /* Additional address bit in instr */
 
 #define EE_MAXADDRLEN   3               /* 24 bit addresses, up to 2 MBytes */
 
@@ -76,7 +75,6 @@ at25_ee_read(
         ssize_t                 status;
         struct spi_transfer     t[2];
         struct spi_message      m;
-        u8                      instr;
 
         if (unlikely(offset >= at25->bin.size))
                 return 0;
@@ -86,12 +84,7 @@ at25_ee_read(
                 return count;
 
         cp = command;
-
-        instr = AT25_READ;
-        if (at25->chip.flags & EE_INSTR_BIT3_IS_ADDR)
-                if (offset >= (1U << (at25->addrlen * 8)))
-                        instr |= AT25_INSTR_BIT3;
-        *cp++ = instr;
+        *cp++ = AT25_READ;
 
         /* 8/16/24-bit address is written MSB first */
         switch (at25->addrlen) {
@@ -174,14 +167,14 @@ at25_ee_write(struct at25_data *at25, const char *buf, loff_t off,
         /* For write, rollover is within the page ... so we write at
          * most one page, then manually roll over to the next page.
          */
+        bounce[0] = AT25_WRITE;
         mutex_lock(&at25->lock);
         do {
                 unsigned long   timeout, retries;
                 unsigned        segment;
                 unsigned        offset = (unsigned) off;
-                u8              *cp = bounce;
+                u8              *cp = bounce + 1;
                 int             sr;
-                u8              instr;
 
                 *cp = AT25_WREN;
                 status = spi_write(at25->spi, cp, 1);
@@ -191,12 +184,6 @@ at25_ee_write(struct at25_data *at25, const char *buf, loff_t off,
                         break;
                 }
 
-                instr = AT25_WRITE;
-                if (at25->chip.flags & EE_INSTR_BIT3_IS_ADDR)
-                        if (offset >= (1U << (at25->addrlen * 8)))
-                                instr |= AT25_INSTR_BIT3;
-                *cp++ = instr;
-
                 /* 8/16/24-bit address is written MSB first */
                 switch (at25->addrlen) {
                 default:        /* case 3 */
@@ -302,90 +289,28 @@ static ssize_t at25_mem_write(struct memory_accessor *mem, const char *buf,
 
 /*-------------------------------------------------------------------------*/
 
-static int at25_np_to_chip(struct device *dev,
-                           struct device_node *np,
-                           struct spi_eeprom *chip)
-{
-        u32 val;
-
-        memset(chip, 0, sizeof(*chip));
-        strncpy(chip->name, np->name, sizeof(chip->name));
-
-        if (of_property_read_u32(np, "size", &val) == 0 ||
-            of_property_read_u32(np, "at25,byte-len", &val) == 0) {
-                chip->byte_len = val;
-        } else {
-                dev_err(dev, "Error: missing \"size\" property\n");
-                return -ENODEV;
-        }
-
-        if (of_property_read_u32(np, "pagesize", &val) == 0 ||
-            of_property_read_u32(np, "at25,page-size", &val) == 0) {
-                chip->page_size = (u16)val;
-        } else {
-                dev_err(dev, "Error: missing \"pagesize\" property\n");
-                return -ENODEV;
-        }
-
-        if (of_property_read_u32(np, "at25,addr-mode", &val) == 0) {
-                chip->flags = (u16)val;
-        } else {
-                if (of_property_read_u32(np, "address-width", &val)) {
-                        dev_err(dev,
-                                "Error: missing \"address-width\" property\n");
-                        return -ENODEV;
-                }
-                switch (val) {
-                case 8:
-                        chip->flags |= EE_ADDR1;
-                        break;
-                case 16:
-                        chip->flags |= EE_ADDR2;
-                        break;
-                case 24:
-                        chip->flags |= EE_ADDR3;
-                        break;
-                default:
-                        dev_err(dev,
-                                "Error: bad \"address-width\" property: %u\n",
-                                val);
-                        return -ENODEV;
-                }
-                if (of_find_property(np, "read-only", NULL))
-                        chip->flags |= EE_READONLY;
-        }
-        return 0;
-}
-
 static int at25_probe(struct spi_device *spi)
 {
         struct at25_data        *at25 = NULL;
-        struct spi_eeprom       chip;
-        struct device_node      *np = spi->dev.of_node;
+        const struct spi_eeprom *chip;
         int                     err;
         int                     sr;
         int                     addrlen;
 
         /* Chip description */
-        if (!spi->dev.platform_data) {
-                if (np) {
-                        err = at25_np_to_chip(&spi->dev, np, &chip);
-                        if (err)
-                                goto fail;
-                } else {
-                        dev_err(&spi->dev, "Error: no chip description\n");
-                        err = -ENODEV;
-                        goto fail;
-                }
-        } else
-                chip = *(struct spi_eeprom *)spi->dev.platform_data;
+        chip = spi->dev.platform_data;
+        if (!chip) {
+                dev_dbg(&spi->dev, "no chip description\n");
+                err = -ENODEV;
+                goto fail;
+        }
 
         /* For now we only support 8/16/24 bit addressing */
-        if (chip.flags & EE_ADDR1)
+        if (chip->flags & EE_ADDR1)
                 addrlen = 1;
-        else if (chip.flags & EE_ADDR2)
+        else if (chip->flags & EE_ADDR2)
                 addrlen = 2;
-        else if (chip.flags & EE_ADDR3)
+        else if (chip->flags & EE_ADDR3)
                 addrlen = 3;
         else {
                 dev_dbg(&spi->dev, "unsupported address type\n");
@@ -410,7 +335,7 @@ static int at25_probe(struct spi_device *spi)
         }
 
         mutex_init(&at25->lock);
-        at25->chip = chip;
+        at25->chip = *chip;
         at25->spi = spi_dev_get(spi);
         dev_set_drvdata(&spi->dev, at25);
         at25->addrlen = addrlen;
@@ -431,7 +356,7 @@ static int at25_probe(struct spi_device *spi)
         at25->mem.read = at25_mem_read;
 
         at25->bin.size = at25->chip.byte_len;
-        if (!(chip.flags & EE_READONLY)) {
+        if (!(chip->flags & EE_READONLY)) {
                 at25->bin.write = at25_bin_write;
                 at25->bin.attr.mode |= S_IWUSR;
                 at25->mem.write = at25_mem_write;
@@ -441,8 +366,8 @@ static int at25_probe(struct spi_device *spi)
         if (err)
                 goto fail;
 
-        if (chip.setup)
-                chip.setup(&at25->mem, chip.context);
+        if (chip->setup)
+                chip->setup(&at25->mem, chip->context);
 
         dev_info(&spi->dev, "%Zd %s %s eeprom%s, pagesize %u\n",
                 (at25->bin.size < 1024)
@@ -450,7 +375,7 @@ static int at25_probe(struct spi_device *spi)
                         : (at25->bin.size / 1024),
                 (at25->bin.size < 1024) ? "Byte" : "KByte",
                 at25->chip.name,
-                (chip.flags & EE_READONLY) ? " (readonly)" : "",
+                (chip->flags & EE_READONLY) ? " (readonly)" : "",
                 at25->chip.page_size);
         return 0;
 fail:
@@ -459,7 +384,7 @@ fail:
         return err;
 }
 
-static int at25_remove(struct spi_device *spi)
+static int __devexit at25_remove(struct spi_device *spi)
 {
         struct at25_data        *at25;
 
@@ -477,10 +402,20 @@ static struct spi_driver at25_driver = {
                 .owner          = THIS_MODULE,
         },
         .probe          = at25_probe,
-        .remove         = at25_remove,
+        .remove         = __devexit_p(at25_remove),
 };
 
-module_spi_driver(at25_driver);
+static int __init at25_init(void)
+{
+        return spi_register_driver(&at25_driver);
+}
+module_init(at25_init);
+
+static void __exit at25_exit(void)
+{
+        spi_unregister_driver(&at25_driver);
+}
+module_exit(at25_exit);
 
 MODULE_DESCRIPTION("Driver for most SPI EEPROMs");
 MODULE_AUTHOR("David Brownell");
diff --git a/drivers/misc/eeprom/eeprom.c b/drivers/misc/eeprom/eeprom.c
index c169e07654c..45060ddc4e5 100644
--- a/drivers/misc/eeprom/eeprom.c
+++ b/drivers/misc/eeprom/eeprom.c
@@ -229,10 +229,22 @@ static struct i2c_driver eeprom_driver = {
         .address_list   = normal_i2c,
 };
 
-module_i2c_driver(eeprom_driver);
+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/misc/eeprom/eeprom_93cx6.c b/drivers/misc/eeprom/eeprom_93cx6.c
index 0ff4b02177b..7b33de95c4b 100644
--- a/drivers/misc/eeprom/eeprom_93cx6.c
+++ b/drivers/misc/eeprom/eeprom_93cx6.c
@@ -63,7 +63,6 @@ static void eeprom_93cx6_startup(struct eeprom_93cx6 *eeprom)
         eeprom->reg_data_out = 0;
         eeprom->reg_data_clock = 0;
         eeprom->reg_chip_select = 1;
-        eeprom->drive_data = 1;
         eeprom->register_write(eeprom);
 
         /*
@@ -102,7 +101,6 @@ static void eeprom_93cx6_write_bits(struct eeprom_93cx6 *eeprom,
          */
         eeprom->reg_data_in = 0;
         eeprom->reg_data_out = 0;
-        eeprom->drive_data = 1;
 
         /*
          * Start writing all bits.
@@ -142,7 +140,6 @@ static void eeprom_93cx6_read_bits(struct eeprom_93cx6 *eeprom,
          */
         eeprom->reg_data_in = 0;
         eeprom->reg_data_out = 0;
-        eeprom->drive_data = 0;
 
         /*
          * Start reading all bits.
@@ -234,88 +231,3 @@ void eeprom_93cx6_multiread(struct eeprom_93cx6 *eeprom, const u8 word,
 }
 EXPORT_SYMBOL_GPL(eeprom_93cx6_multiread);
 
-/**
- * eeprom_93cx6_wren - set the write enable state
- * @eeprom: Pointer to eeprom structure
- * @enable: true to enable writes, otherwise disable writes
- *
- * Set the EEPROM write enable state to either allow or deny
- * writes depending on the @enable value.
- */
-void eeprom_93cx6_wren(struct eeprom_93cx6 *eeprom, bool enable)
-{
-        u16 command;
-
-        /* start the command */
-        eeprom_93cx6_startup(eeprom);
-
-        /* create command to enable/disable */
-
-        command = enable ? PCI_EEPROM_EWEN_OPCODE : PCI_EEPROM_EWDS_OPCODE;
-        command <<= (eeprom->width - 2);
-
-        eeprom_93cx6_write_bits(eeprom, command,
-                                PCI_EEPROM_WIDTH_OPCODE + eeprom->width);
-
-        eeprom_93cx6_cleanup(eeprom);
-}
-EXPORT_SYMBOL_GPL(eeprom_93cx6_wren);
-
-/**
- * eeprom_93cx6_write - write data to the EEPROM
- * @eeprom: Pointer to eeprom structure
- * @addr: Address to write data to.
- * @data: The data to write to address @addr.
- *
- * Write the @data to the specified @addr in the EEPROM and
- * waiting for the device to finish writing.
- *
- * Note, since we do not expect large number of write operations
- * we delay in between parts of the operation to avoid using excessive
- * amounts of CPU time busy waiting.
- */
-void eeprom_93cx6_write(struct eeprom_93cx6 *eeprom, u8 addr, u16 data)
-{
-        int timeout = 100;
-        u16 command;
-
-        /* start the command */
-        eeprom_93cx6_startup(eeprom);
-
-        command = PCI_EEPROM_WRITE_OPCODE << eeprom->width;
-        command |= addr;
-
-        /* send write command */
-        eeprom_93cx6_write_bits(eeprom, command,
-                                PCI_EEPROM_WIDTH_OPCODE + eeprom->width);
-
-        /* send data */
-        eeprom_93cx6_write_bits(eeprom, data, 16);
-
-        /* get ready to check for busy */
-        eeprom->drive_data = 0;
-        eeprom->reg_chip_select = 1;
-        eeprom->register_write(eeprom);
-
-        /* wait at-least 250ns to get DO to be the busy signal */
-        usleep_range(1000, 2000);
-
-        /* wait for DO to go high to signify finish */
-
-        while (true) {
-                eeprom->register_read(eeprom);
-
-                if (eeprom->reg_data_out)
-                        break;
-
-                usleep_range(1000, 2000);
-
-                if (--timeout <= 0) {
-                        printk(KERN_ERR "%s: timeout\n", __func__);
-                        break;
-                }
-        }
-
-        eeprom_93cx6_cleanup(eeprom);
-}
-EXPORT_SYMBOL_GPL(eeprom_93cx6_write);
diff --git a/drivers/misc/eeprom/eeprom_93xx46.c b/drivers/misc/eeprom/eeprom_93xx46.c
index a6b5d5e7348..0c7ebb1e19e 100644
--- a/drivers/misc/eeprom/eeprom_93xx46.c
+++ b/drivers/misc/eeprom/eeprom_93xx46.c
@@ -309,7 +309,7 @@ static ssize_t eeprom_93xx46_store_erase(struct device *dev,
 }
 static DEVICE_ATTR(erase, S_IWUSR, NULL, eeprom_93xx46_store_erase);
 
-static int eeprom_93xx46_probe(struct spi_device *spi)
+static int __devinit eeprom_93xx46_probe(struct spi_device *spi)
 {
         struct eeprom_93xx46_platform_data *pd;
         struct eeprom_93xx46_dev *edev;
@@ -370,7 +370,7 @@ fail:
         return err;
 }
 
-static int eeprom_93xx46_remove(struct spi_device *spi)
+static int __devexit eeprom_93xx46_remove(struct spi_device *spi)
 {
         struct eeprom_93xx46_dev *edev = dev_get_drvdata(&spi->dev);
 
@@ -389,10 +389,20 @@ static struct spi_driver eeprom_93xx46_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = eeprom_93xx46_probe,
-        .remove         = eeprom_93xx46_remove,
+        .remove         = __devexit_p(eeprom_93xx46_remove),
 };
 
-module_spi_driver(eeprom_93xx46_driver);
+static int __init eeprom_93xx46_init(void)
+{
+        return spi_register_driver(&eeprom_93xx46_driver);
+}
+module_init(eeprom_93xx46_init);
+
+static void __exit eeprom_93xx46_exit(void)
+{
+        spi_unregister_driver(&eeprom_93xx46_driver);
+}
+module_exit(eeprom_93xx46_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Driver for 93xx46 EEPROMs");
diff --git a/drivers/misc/eeprom/max6875.c b/drivers/misc/eeprom/max6875.c
index e36157d5d3a..5653a3ce051 100644
--- a/drivers/misc/eeprom/max6875.c
+++ b/drivers/misc/eeprom/max6875.c
@@ -208,8 +208,20 @@ static struct i2c_driver max6875_driver = {
         .id_table       = max6875_id,
 };
 
-module_i2c_driver(max6875_driver);
+static int __init max6875_init(void)
+{
+        return i2c_add_driver(&max6875_driver);
+}
+
+static void __exit max6875_exit(void)
+{
+        i2c_del_driver(&max6875_driver);
+}
+
 
 MODULE_AUTHOR("Ben Gardner <bgardner@wabtec.com>");
 MODULE_DESCRIPTION("MAX6875 driver");
 MODULE_LICENSE("GPL");
+
+module_init(max6875_init);
+module_exit(max6875_exit);