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

1 files changed, 109 insertions, 1 deletions

diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index b298b730943c..ea88722cb4ab 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -24,10 +24,14 @@
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <media/cx25840.h>
+#include <linux/firmware.h>
+#include <staging/altera.h>
 
 #include "cx23885.h"
 #include "tuner-xc2028.h"
 #include "netup-init.h"
+#include "altera-ci.h"
+#include "xc5000.h"
 #include "cx23888-ir.h"
 
 static unsigned int enable_885_ir;
@@ -90,6 +94,7 @@ struct cx23885_board cx23885_boards[] = {
                 .portc          = CX23885_MPEG_DVB,
                 .tuner_type     = TUNER_PHILIPS_TDA8290,
                 .tuner_addr     = 0x42, /* 0x84 >> 1 */
+                .tuner_bus      = 1,
                 .input          = {{
                         .type   = CX23885_VMUX_TELEVISION,
                         .vmux   =       CX25840_VIN7_CH3 |
@@ -187,7 +192,7 @@ struct cx23885_board cx23885_boards[] = {
                 .portb          = CX23885_MPEG_DVB,
         },
         [CX23885_BOARD_NETUP_DUAL_DVBS2_CI] = {
-                .cimax          = 1,
+                .ci_type        = 1,
                 .name           = "NetUP Dual DVB-S2 CI",
                 .portb          = CX23885_MPEG_DVB,
                 .portc          = CX23885_MPEG_DVB,
@@ -212,6 +217,7 @@ struct cx23885_board cx23885_boards[] = {
                 .name           = "Mygica X8506 DMB-TH",
                 .tuner_type = TUNER_XC5000,
                 .tuner_addr = 0x61,
+                .tuner_bus      = 1,
                 .porta          = CX23885_ANALOG_VIDEO,
                 .portb          = CX23885_MPEG_DVB,
                 .input          = {
@@ -241,6 +247,7 @@ struct cx23885_board cx23885_boards[] = {
                 .name           = "Magic-Pro ProHDTV Extreme 2",
                 .tuner_type = TUNER_XC5000,
                 .tuner_addr = 0x61,
+                .tuner_bus      = 1,
                 .porta          = CX23885_ANALOG_VIDEO,
                 .portb          = CX23885_MPEG_DVB,
                 .input          = {
@@ -289,6 +296,7 @@ struct cx23885_board cx23885_boards[] = {
                 .porta          = CX23885_ANALOG_VIDEO,
                 .tuner_type     = TUNER_XC2028,
                 .tuner_addr     = 0x61,
+                .tuner_bus      = 1,
                 .input          = {{
                         .type   = CX23885_VMUX_TELEVISION,
                         .vmux   = CX25840_VIN2_CH1 |
@@ -313,6 +321,7 @@ struct cx23885_board cx23885_boards[] = {
                 .name           = "GoTView X5 3D Hybrid",
                 .tuner_type     = TUNER_XC5000,
                 .tuner_addr     = 0x64,
+                .tuner_bus      = 1,
                 .porta          = CX23885_ANALOG_VIDEO,
                 .portb          = CX23885_MPEG_DVB,
                 .input          = {{
@@ -329,6 +338,21 @@ struct cx23885_board cx23885_boards[] = {
                                   CX25840_SVIDEO_CHROMA4,
                 } },
         },
+        [CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF] = {
+                .ci_type        = 2,
+                .name           = "NetUP Dual DVB-T/C-CI RF",
+                .porta          = CX23885_ANALOG_VIDEO,
+                .portb          = CX23885_MPEG_DVB,
+                .portc          = CX23885_MPEG_DVB,
+                .num_fds_portb  = 2,
+                .num_fds_portc  = 2,
+                .tuner_type     = TUNER_XC5000,
+                .tuner_addr     = 0x64,
+                .input          = { {
+                                .type   = CX23885_VMUX_TELEVISION,
+                                .vmux   = CX25840_COMPOSITE1,
+                } },
+        },
 };
 const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
 
@@ -520,6 +544,10 @@ struct cx23885_subid cx23885_subids[] = {
                 .subvendor = 0x5654,
                 .subdevice = 0x2390,
                 .card      = CX23885_BOARD_GOTVIEW_X5_3D_HYBRID,
+        }, {
+                .subvendor = 0x1b55,
+                .subdevice = 0xe2e4,
+                .card      = CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF,
         },
 };
 const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -740,6 +768,9 @@ int cx23885_tuner_callback(void *priv, int component, int command, int arg)
                 /* Tuner Reset Command */
                 bitmask = 0x02;
                 break;
+        case CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF:
+                altera_ci_tuner_reset(dev, port->nr);
+                break;
         }
 
         if (bitmask) {
@@ -998,6 +1029,33 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_GOTVIEW_X5_3D_HYBRID:
                 cx_set(GP0_IO, 0x00010001); /* Bring the part out of reset */
                 break;
+        case CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF:
+                /* GPIO-0 ~INT in
+                   GPIO-1 TMS out
+                   GPIO-2 ~reset chips out
+                   GPIO-3 to GPIO-10 data/addr for CA in/out
+                   GPIO-11 ~CS out
+                   GPIO-12 ADDR out
+                   GPIO-13 ~WR out
+                   GPIO-14 ~RD out
+                   GPIO-15 ~RDY in
+                   GPIO-16 TCK out
+                   GPIO-17 TDO in
+                   GPIO-18 TDI out
+                 */
+                cx_set(GP0_IO, 0x00060000); /* GPIO-1,2 as out */
+                /* GPIO-0 as INT, reset & TMS low */
+                cx_clear(GP0_IO, 0x00010006);
+                mdelay(100);/* reset delay */
+                cx_set(GP0_IO, 0x00000004); /* reset high */
+                cx_write(MC417_CTL, 0x00000037);/* enable GPIO-3..18 pins */
+                /* GPIO-17 is TDO in, GPIO-15 is ~RDY in, rest is out */
+                cx_write(MC417_OEN, 0x00005000);
+                /* ~RD, ~WR high; ADDR low; ~CS high */
+                cx_write(MC417_RWD, 0x00000d00);
+                /* enable irq */
+                cx_write(GPIO_ISM, 0x00000000);/* INTERRUPTS active low*/
+                break;
         }
 }
 
@@ -1113,6 +1171,31 @@ void cx23885_ir_fini(struct cx23885_dev *dev)
         }
 }
 
+int netup_jtag_io(void *device, int tms, int tdi, int read_tdo)
+{
+        int data;
+        int tdo = 0;
+        struct cx23885_dev *dev = (struct cx23885_dev *)device;
+        /*TMS*/
+        data = ((cx_read(GP0_IO)) & (~0x00000002));
+        data |= (tms ? 0x00020002 : 0x00020000);
+        cx_write(GP0_IO, data);
+
+        /*TDI*/
+        data = ((cx_read(MC417_RWD)) & (~0x0000a000));
+        data |= (tdi ? 0x00008000 : 0);
+        cx_write(MC417_RWD, data);
+        if (read_tdo)
+                tdo = (data & 0x00004000) ? 1 : 0; /*TDO*/
+
+        cx_write(MC417_RWD, data | 0x00002000);
+        udelay(1);
+        /*TCK*/
+        cx_write(MC417_RWD, data);
+
+        return tdo;
+}
+
 void cx23885_ir_pci_int_enable(struct cx23885_dev *dev)
 {
         switch (dev->board) {
@@ -1212,6 +1295,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
                 ts1->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
                 break;
         case CX23885_BOARD_NETUP_DUAL_DVBS2_CI:
+        case CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF:
                 ts1->gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */
                 ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
                 ts1->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
@@ -1271,6 +1355,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
         case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
         case CX23885_BOARD_NETUP_DUAL_DVBS2_CI:
+        case CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF:
         case CX23885_BOARD_COMPRO_VIDEOMATE_E800:
         case CX23885_BOARD_HAUPPAUGE_HVR1850:
         case CX23885_BOARD_MYGICA_X8506:
@@ -1293,6 +1378,29 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_NETUP_DUAL_DVBS2_CI:
                 netup_initialize(dev);
                 break;
+        case CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF: {
+                int ret;
+                const struct firmware *fw;
+                const char *filename = "dvb-netup-altera-01.fw";
+                char *action = "configure";
+                struct altera_config netup_config = {
+                        .dev = dev,
+                        .action = action,
+                        .jtag_io = netup_jtag_io,
+                };
+
+                netup_initialize(dev);
+
+                ret = request_firmware(&fw, filename, &dev->pci->dev);
+                if (ret != 0)
+                        printk(KERN_ERR "did not find the firmware file. (%s) "
+                        "Please see linux/Documentation/dvb/ for more details "
+                        "on firmware-problems.", filename);
+                else
+                        altera_init(&netup_config, fw);
+
+                break;
+        }
         }
 }