Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (442 commits)
  [media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t
  [media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly
  [media] V4L: soc-camera: explicitly require V4L2_BUF_TYPE_VIDEO_CAPTURE
  [media] v4l: soc-camera: Store negotiated buffer settings
  [media] rc: interim support for 32-bit NEC-ish scancodes
  [media] mceusb: topseed 0x0011 needs gen3 init for tx to work
  [media] lirc_zilog: error out if buffer read bytes != chunk size
  [media] lirc: silence some compile warnings
  [media] hdpvr: use same polling interval as other OS
  [media] ir-kbd-i2c: pass device code w/key in hauppauge case
  [media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap
  [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map
  [media] rc/keymaps: Rename Hauppauge table as rc-hauppauge
  [media] rc-rc5-hauppauge-new: Fix Hauppauge Grey mapping
  [media] rc-rc5-hauppauge-new: Add support for the old Black RC
  [media] rc-rc5-hauppauge-new: Add the old control to the table
  [media] rc-winfast: Fix the keycode tables
  [media] a800: Fix a few wrong IR key assignments
  [media] opera1: Use multimedia keys instead of an app-specific mapping
  [media] dw2102: Use multimedia keys instead of an app-specific mapping
  ...

Fix up trivial conflicts (remove/modify and some real conflicts) in:
	arch/arm/mach-omap2/devices.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/dabusb/dabusb.c
	drivers/staging/dabusb/dabusb.h
	drivers/staging/easycap/easycap_ioctl.c
	drivers/staging/usbvideo/usbvideo.c
	drivers/staging/usbvideo/vicam.c

2 files changed, 147 insertions, 2 deletions

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 8d7d098f7a03..a9a1af49281e 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -666,7 +666,7 @@ config MFD_VX855
           and/or vx855_gpio drivers for this to do anything useful.
 
 config MFD_WL1273_CORE
-        tristate
+        tristate "Support for TI WL1273 FM radio."
         depends on I2C
         select MFD_CORE
         default n
diff --git a/drivers/mfd/wl1273-core.c b/drivers/mfd/wl1273-core.c
index 529d65ba5353..f76f6c798046 100644
--- a/drivers/mfd/wl1273-core.c
+++ b/drivers/mfd/wl1273-core.c
@@ -1,7 +1,7 @@
 /*
  * MFD driver for wl1273 FM radio and audio codec submodules.
  *
- * Copyright (C) 2010 Nokia Corporation
+ * Copyright (C) 2011 Nokia Corporation
  * Author: Matti Aaltonen <matti.j.aaltonen@nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -31,6 +31,145 @@ static struct i2c_device_id wl1273_driver_id_table[] = {
 };
 MODULE_DEVICE_TABLE(i2c, wl1273_driver_id_table);
 
+static int wl1273_fm_read_reg(struct wl1273_core *core, u8 reg, u16 *value)
+{
+        struct i2c_client *client = core->client;
+        u8 b[2];
+        int r;
+
+        r = i2c_smbus_read_i2c_block_data(client, reg, sizeof(b), b);
+        if (r != 2) {
+                dev_err(&client->dev, "%s: Read: %d fails.\n", __func__, reg);
+                return -EREMOTEIO;
+        }
+
+        *value = (u16)b[0] << 8 | b[1];
+
+        return 0;
+}
+
+static int wl1273_fm_write_cmd(struct wl1273_core *core, u8 cmd, u16 param)
+{
+        struct i2c_client *client = core->client;
+        u8 buf[] = { (param >> 8) & 0xff, param & 0xff };
+        int r;
+
+        r = i2c_smbus_write_i2c_block_data(client, cmd, sizeof(buf), buf);
+        if (r) {
+                dev_err(&client->dev, "%s: Cmd: %d fails.\n", __func__, cmd);
+                return r;
+        }
+
+        return 0;
+}
+
+static int wl1273_fm_write_data(struct wl1273_core *core, u8 *data, u16 len)
+{
+        struct i2c_client *client = core->client;
+        struct i2c_msg msg;
+        int r;
+
+        msg.addr = client->addr;
+        msg.flags = 0;
+        msg.buf = data;
+        msg.len = len;
+
+        r = i2c_transfer(client->adapter, &msg, 1);
+        if (r != 1) {
+                dev_err(&client->dev, "%s: write error.\n", __func__);
+                return -EREMOTEIO;
+        }
+
+        return 0;
+}
+
+/**
+ * wl1273_fm_set_audio() -      Set audio mode.
+ * @core:                       A pointer to the device struct.
+ * @new_mode:                   The new audio mode.
+ *
+ * Audio modes are WL1273_AUDIO_DIGITAL and WL1273_AUDIO_ANALOG.
+ */
+static int wl1273_fm_set_audio(struct wl1273_core *core, unsigned int new_mode)
+{
+        int r = 0;
+
+        if (core->mode == WL1273_MODE_OFF ||
+            core->mode == WL1273_MODE_SUSPENDED)
+                return -EPERM;
+
+        if (core->mode == WL1273_MODE_RX && new_mode == WL1273_AUDIO_DIGITAL) {
+                r = wl1273_fm_write_cmd(core, WL1273_PCM_MODE_SET,
+                                        WL1273_PCM_DEF_MODE);
+                if (r)
+                        goto out;
+
+                r = wl1273_fm_write_cmd(core, WL1273_I2S_MODE_CONFIG_SET,
+                                        core->i2s_mode);
+                if (r)
+                        goto out;
+
+                r = wl1273_fm_write_cmd(core, WL1273_AUDIO_ENABLE,
+                                        WL1273_AUDIO_ENABLE_I2S);
+                if (r)
+                        goto out;
+
+        } else if (core->mode == WL1273_MODE_RX &&
+                   new_mode == WL1273_AUDIO_ANALOG) {
+                r = wl1273_fm_write_cmd(core, WL1273_AUDIO_ENABLE,
+                                        WL1273_AUDIO_ENABLE_ANALOG);
+                if (r)
+                        goto out;
+
+        } else if (core->mode == WL1273_MODE_TX &&
+                   new_mode == WL1273_AUDIO_DIGITAL) {
+                r = wl1273_fm_write_cmd(core, WL1273_I2S_MODE_CONFIG_SET,
+                                        core->i2s_mode);
+                if (r)
+                        goto out;
+
+                r = wl1273_fm_write_cmd(core, WL1273_AUDIO_IO_SET,
+                                        WL1273_AUDIO_IO_SET_I2S);
+                if (r)
+                        goto out;
+
+        } else if (core->mode == WL1273_MODE_TX &&
+                   new_mode == WL1273_AUDIO_ANALOG) {
+                r = wl1273_fm_write_cmd(core, WL1273_AUDIO_IO_SET,
+                                        WL1273_AUDIO_IO_SET_ANALOG);
+                if (r)
+                        goto out;
+        }
+
+        core->audio_mode = new_mode;
+out:
+        return r;
+}
+
+/**
+ * wl1273_fm_set_volume() -     Set volume.
+ * @core:                       A pointer to the device struct.
+ * @volume:                     The new volume value.
+ */
+static int wl1273_fm_set_volume(struct wl1273_core *core, unsigned int volume)
+{
+        u16 val;
+        int r;
+
+        if (volume > WL1273_MAX_VOLUME)
+                return -EINVAL;
+
+        if (core->volume == volume)
+                return 0;
+
+        r = wl1273_fm_write_cmd(core, WL1273_VOLUME_SET, volume);
+        if (r)
+                return r;
+
+        core->volume = volume;
+        return 0;
+}
+
 static int wl1273_core_remove(struct i2c_client *client)
 {
         struct wl1273_core *core = i2c_get_clientdata(client);
@@ -81,6 +220,12 @@ static int __devinit wl1273_core_probe(struct i2c_client *client,
         cell->mfd_data = &core;
         children++;
 
+        core->read = wl1273_fm_read_reg;
+        core->write = wl1273_fm_write_cmd;
+        core->write_data = wl1273_fm_write_data;
+        core->set_audio = wl1273_fm_set_audio;
+        core->set_volume = wl1273_fm_set_volume;
+
         if (pdata->children & WL1273_CODEC_CHILD) {
                 cell = &core->cells[children];