Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (510 commits)
  staging: speakup: fix failure handling
  staging: usbip: remove double giveback of URB
  Staging: batman-adv: Remove batman-adv from staging
  Staging: hv: Use only one txf buffer per channel and kmalloc/GFP_KERNEL on initialize
  staging: hv: remove unneeded osd_schedule_callback
  staging: hv: convert channel_mgmt.c to not call osd_schedule_callback
  staging: hv: convert vmbus_on_msg_dpc to not call osd_schedule_callback
  staging: brcm80211: Fix WL_<type> logging macros
  Staging: IIO: DDS: AD9833 / AD9834 driver
  Staging: IIO: dds.h convenience macros
  Staging: IIO: Direct digital synthesis abi documentation
  staging: brcm80211: Convert ETHER_TYPE_802_1X to ETH_P_PAE
  staging: brcm80211: Remove unused ETHER_TYPE_<foo> #defines
  staging: brcm80211: Remove ETHER_HDR_LEN, use ETH_HLEN
  staging: brcm80211: Convert ETHER_ADDR_LEN to ETH_ALEN
  staging: brcm80211: Convert ETHER_IS<FOO> to is_<foo>_ether_addr
  staging: brcm80211: Remove unused ether_<foo> #defines and struct
  staging: brcm80211: Convert ETHER_IS_MULTI to is_multicast_ether_addr
  staging: brcm80211: Remove unused #defines ETHER_<foo>_LOCALADDR
  Staging: comedi: Fix checkpatch.pl issues in file s526.c
  ...

Fix up trivial conflict in drivers/video/udlfb.c

1 files changed, 360 insertions, 0 deletions

diff --git a/drivers/staging/iio/meter/ade7854-spi.c b/drivers/staging/iio/meter/ade7854-spi.c
new file mode 100644
index 00000000000..fe58103ed4c
--- /dev/null
+++ b/drivers/staging/iio/meter/ade7854-spi.c
@@ -0,0 +1,360 @@
+/*
+ * ADE7854/58/68/78 Polyphase Multifunction Energy Metering IC Driver (SPI Bus)
+ *
+ * Copyright 2010 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+
+#include "../iio.h"
+#include "ade7854.h"
+
+static int ade7854_spi_write_reg_8(struct device *dev,
+                u16 reg_address,
+                u8 value)
+{
+        int ret;
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 4,
+                }
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7854_WRITE_REG;
+        st->tx[1] = (reg_address >> 8) & 0xFF;
+        st->tx[2] = reg_address & 0xFF;
+        st->tx[3] = value & 0xFF;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->spi, &msg);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+static int ade7854_spi_write_reg_16(struct device *dev,
+                u16 reg_address,
+                u16 value)
+{
+        int ret;
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 5,
+                }
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7854_WRITE_REG;
+        st->tx[1] = (reg_address >> 8) & 0xFF;
+        st->tx[2] = reg_address & 0xFF;
+        st->tx[3] = (value >> 8) & 0xFF;
+        st->tx[4] = value & 0xFF;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->spi, &msg);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+static int ade7854_spi_write_reg_24(struct device *dev,
+                u16 reg_address,
+                u32 value)
+{
+        int ret;
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 6,
+                }
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7854_WRITE_REG;
+        st->tx[1] = (reg_address >> 8) & 0xFF;
+        st->tx[2] = reg_address & 0xFF;
+        st->tx[3] = (value >> 16) & 0xFF;
+        st->tx[4] = (value >> 8) & 0xFF;
+        st->tx[5] = value & 0xFF;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->spi, &msg);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+static int ade7854_spi_write_reg_32(struct device *dev,
+                u16 reg_address,
+                u32 value)
+{
+        int ret;
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 7,
+                }
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7854_WRITE_REG;
+        st->tx[1] = (reg_address >> 8) & 0xFF;
+        st->tx[2] = reg_address & 0xFF;
+        st->tx[3] = (value >> 24) & 0xFF;
+        st->tx[4] = (value >> 16) & 0xFF;
+        st->tx[5] = (value >> 8) & 0xFF;
+        st->tx[6] = value & 0xFF;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->spi, &msg);
+        mutex_unlock(&st->buf_lock);
+
+        return ret;
+}
+
+static int ade7854_spi_read_reg_8(struct device *dev,
+                u16 reg_address,
+                u8 *val)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 4,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+
+        st->tx[0] = ADE7854_READ_REG;
+        st->tx[1] = (reg_address >> 8) & 0xFF;
+        st->tx[2] = reg_address & 0xFF;
+        st->tx[3] = 0;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->spi, &msg);
+        if (ret) {
+                dev_err(&st->spi->dev, "problem when reading 8 bit register 0x%02X",
+                                reg_address);
+                goto error_ret;
+        }
+        *val = st->rx[3];
+
+error_ret:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static int ade7854_spi_read_reg_16(struct device *dev,
+                u16 reg_address,
+                u16 *val)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 5,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+        st->tx[0] = ADE7854_READ_REG;
+        st->tx[1] = (reg_address >> 8) & 0xFF;
+        st->tx[2] = reg_address & 0xFF;
+        st->tx[3] = 0;
+        st->tx[4] = 0;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->spi, &msg);
+        if (ret) {
+                dev_err(&st->spi->dev, "problem when reading 16 bit register 0x%02X",
+                                reg_address);
+                goto error_ret;
+        }
+        *val = (st->rx[3] << 8) | st->rx[4];
+
+error_ret:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static int ade7854_spi_read_reg_24(struct device *dev,
+                u16 reg_address,
+                u32 *val)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 6,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+
+        st->tx[0] = ADE7854_READ_REG;
+        st->tx[1] = (reg_address >> 8) & 0xFF;
+        st->tx[2] = reg_address & 0xFF;
+        st->tx[3] = 0;
+        st->tx[4] = 0;
+        st->tx[5] = 0;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->spi, &msg);
+        if (ret) {
+                dev_err(&st->spi->dev, "problem when reading 24 bit register 0x%02X",
+                                reg_address);
+                goto error_ret;
+        }
+        *val = (st->rx[3] << 16) | (st->rx[4] << 8) | st->rx[5];
+
+error_ret:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static int ade7854_spi_read_reg_32(struct device *dev,
+                u16 reg_address,
+                u32 *val)
+{
+        struct spi_message msg;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ade7854_state *st = iio_dev_get_devdata(indio_dev);
+        int ret;
+        struct spi_transfer xfers[] = {
+                {
+                        .tx_buf = st->tx,
+                        .bits_per_word = 8,
+                        .len = 7,
+                },
+        };
+
+        mutex_lock(&st->buf_lock);
+
+        st->tx[0] = ADE7854_READ_REG;
+        st->tx[1] = (reg_address >> 8) & 0xFF;
+        st->tx[2] = reg_address & 0xFF;
+        st->tx[3] = 0;
+        st->tx[4] = 0;
+        st->tx[5] = 0;
+        st->tx[6] = 0;
+
+        spi_message_init(&msg);
+        spi_message_add_tail(xfers, &msg);
+        ret = spi_sync(st->spi, &msg);
+        if (ret) {
+                dev_err(&st->spi->dev, "problem when reading 32 bit register 0x%02X",
+                                reg_address);
+                goto error_ret;
+        }
+        *val = (st->rx[3] << 24) | (st->rx[4] << 16) | (st->rx[5] << 8) | st->rx[6];
+
+error_ret:
+        mutex_unlock(&st->buf_lock);
+        return ret;
+}
+
+static int __devinit ade7854_spi_probe(struct spi_device *spi)
+{
+        int ret;
+        struct ade7854_state *st = kzalloc(sizeof *st, GFP_KERNEL);
+        if (!st) {
+                ret =  -ENOMEM;
+                return ret;
+        }
+
+        spi_set_drvdata(spi, st);
+        st->read_reg_8 = ade7854_spi_read_reg_8;
+        st->read_reg_16 = ade7854_spi_read_reg_16;
+        st->read_reg_24 = ade7854_spi_read_reg_24;
+        st->read_reg_32 = ade7854_spi_read_reg_32;
+        st->write_reg_8 = ade7854_spi_write_reg_8;
+        st->write_reg_16 = ade7854_spi_write_reg_16;
+        st->write_reg_24 = ade7854_spi_write_reg_24;
+        st->write_reg_32 = ade7854_spi_write_reg_32;
+        st->irq = spi->irq;
+        st->spi = spi;
+
+        ret = ade7854_probe(st, &spi->dev);
+        if (ret) {
+                kfree(st);
+                return ret;
+        }
+
+        return 0;
+}
+
+static int ade7854_spi_remove(struct spi_device *spi)
+{
+        ade7854_remove(spi_get_drvdata(spi));
+
+        return 0;
+}
+
+static struct spi_driver ade7854_driver = {
+        .driver = {
+                .name = "ade7854",
+                .owner = THIS_MODULE,
+        },
+        .probe = ade7854_spi_probe,
+        .remove = __devexit_p(ade7854_spi_remove),
+};
+
+static __init int ade7854_init(void)
+{
+        return spi_register_driver(&ade7854_driver);
+}
+module_init(ade7854_init);
+
+static __exit void ade7854_exit(void)
+{
+        spi_unregister_driver(&ade7854_driver);
+}
+module_exit(ade7854_exit);
+
+MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
+MODULE_DESCRIPTION("Analog Devices ADE7854/58/68/78 Polyphase Multifunction Energy Metering IC SPI Driver");
+MODULE_LICENSE("GPL v2");