Merge with mainline to remove plat-omap/Kconfig conflict

Conflicts:
	arch/arm/plat-omap/Kconfig

6 files changed, 57 insertions, 12 deletions

diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c
index 88c0d2481118..2ab97ad7b6fb 100644
--- a/drivers/media/video/cx23885/cx23885-417.c
+++ b/drivers/media/video/cx23885/cx23885-417.c
@@ -681,7 +681,7 @@ static char *cmd_to_str(int cmd)
         case CX2341X_ENC_SET_VIDEO_ID:
                 return  "SET_VIDEO_ID";
         case CX2341X_ENC_SET_PCR_ID:
-                return  "SET_PCR_PID";
+                return  "SET_PCR_ID";
         case CX2341X_ENC_SET_FRAME_RATE:
                 return  "SET_FRAME_RATE";
         case CX2341X_ENC_SET_FRAME_SIZE:
@@ -693,7 +693,7 @@ static char *cmd_to_str(int cmd)
         case CX2341X_ENC_SET_ASPECT_RATIO:
                 return  "SET_ASPECT_RATIO";
         case CX2341X_ENC_SET_DNR_FILTER_MODE:
-                return  "SET_DNR_FILTER_PROPS";
+                return  "SET_DNR_FILTER_MODE";
         case CX2341X_ENC_SET_DNR_FILTER_PROPS:
                 return  "SET_DNR_FILTER_PROPS";
         case CX2341X_ENC_SET_CORING_LEVELS:
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index 1ec48169277d..d639186f645d 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -274,6 +274,31 @@ struct cx23885_board cx23885_boards[] = {
                 .portb          = CX23885_MPEG_DVB,
                 .portc          = CX23885_MPEG_DVB,
         },
+        [CX23885_BOARD_LEADTEK_WINFAST_PXTV1200] = {
+                .name           = "LEADTEK WinFast PxTV1200",
+                .porta          = CX23885_ANALOG_VIDEO,
+                .tuner_type     = TUNER_XC2028,
+                .tuner_addr     = 0x61,
+                .input          = {{
+                        .type   = CX23885_VMUX_TELEVISION,
+                        .vmux   = CX25840_VIN2_CH1 |
+                                  CX25840_VIN5_CH2 |
+                                  CX25840_NONE0_CH3,
+                }, {
+                        .type   = CX23885_VMUX_COMPOSITE1,
+                        .vmux   = CX25840_COMPOSITE1,
+                }, {
+                        .type   = CX23885_VMUX_SVIDEO,
+                        .vmux   = CX25840_SVIDEO_LUMA3 |
+                                  CX25840_SVIDEO_CHROMA4,
+                }, {
+                        .type   = CX23885_VMUX_COMPONENT,
+                        .vmux   = CX25840_VIN7_CH1 |
+                                  CX25840_VIN6_CH2 |
+                                  CX25840_VIN8_CH3 |
+                                  CX25840_COMPONENT_ON,
+                } },
+        },
 };
 const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
 
@@ -417,6 +442,10 @@ struct cx23885_subid cx23885_subids[] = {
                 .subvendor = 0x14f1,
                 .subdevice = 0x8578,
                 .card      = CX23885_BOARD_MYGICA_X8558PRO,
+        }, {
+                .subvendor = 0x107d,
+                .subdevice = 0x6f22,
+                .card      = CX23885_BOARD_LEADTEK_WINFAST_PXTV1200,
         },
 };
 const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -617,6 +646,7 @@ int cx23885_tuner_callback(void *priv, int component, int command, int arg)
         case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
         case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
         case CX23885_BOARD_COMPRO_VIDEOMATE_E800:
+        case CX23885_BOARD_LEADTEK_WINFAST_PXTV1200:
                 /* Tuner Reset Command */
                 bitmask = 0x04;
                 break;
@@ -769,6 +799,7 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
         case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
         case CX23885_BOARD_COMPRO_VIDEOMATE_E800:
+        case CX23885_BOARD_LEADTEK_WINFAST_PXTV1200:
                 /* GPIO-2  xc3028 tuner reset */
 
                 /* The following GPIO's are on the internal AVCore (cx25840) */
@@ -1076,6 +1107,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_MYGICA_X8506:
         case CX23885_BOARD_MAGICPRO_PROHDTVE2:
         case CX23885_BOARD_HAUPPAUGE_HVR1290:
+        case CX23885_BOARD_LEADTEK_WINFAST_PXTV1200:
                 dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,
                                 &dev->i2c_bus[2].i2c_adap,
                                 "cx25840", "cx25840", 0x88 >> 1, NULL);
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index e45d2df08138..939079d7bbb9 100644
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -542,6 +542,9 @@ static struct atbm8830_config mygica_x8558pro_atbm8830_cfg1 = {
         .osc_clk_freq = 30400, /* in kHz */
         .if_freq = 0, /* zero IF */
         .zif_swap_iq = 1,
+        .agc_min = 0x2E,
+        .agc_max = 0xFF,
+        .agc_hold_loop = 0,
 };
 
 static struct max2165_config mygic_x8558pro_max2165_cfg1 = {
@@ -558,6 +561,9 @@ static struct atbm8830_config mygica_x8558pro_atbm8830_cfg2 = {
         .osc_clk_freq = 30400, /* in kHz */
         .if_freq = 0, /* zero IF */
         .zif_swap_iq = 1,
+        .agc_min = 0x2E,
+        .agc_max = 0xFF,
+        .agc_hold_loop = 0,
 };
 
 static struct max2165_config mygic_x8558pro_max2165_cfg2 = {
@@ -994,15 +1000,8 @@ static int dvb_register(struct cx23885_tsport *port)
                 netup_get_card_info(&dev->i2c_bus[0].i2c_adap, &cinfo);
                 memcpy(port->frontends.adapter.proposed_mac,
                                 cinfo.port[port->nr - 1].mac, 6);
-                printk(KERN_INFO "NetUP Dual DVB-S2 CI card port%d MAC="
-                        "%02X:%02X:%02X:%02X:%02X:%02X\n",
-                        port->nr,
-                        port->frontends.adapter.proposed_mac[0],
-                        port->frontends.adapter.proposed_mac[1],
-                        port->frontends.adapter.proposed_mac[2],
-                        port->frontends.adapter.proposed_mac[3],
-                        port->frontends.adapter.proposed_mac[4],
-                        port->frontends.adapter.proposed_mac[5]);
+                printk(KERN_INFO "NetUP Dual DVB-S2 CI card port%d MAC=%pM\n",
+                        port->nr, port->frontends.adapter.proposed_mac);
 
                 netup_ci_init(port);
                 break;
diff --git a/drivers/media/video/cx23885/cx23885-input.c b/drivers/media/video/cx23885/cx23885-input.c
index 768eec92ccf9..9c6620f86dca 100644
--- a/drivers/media/video/cx23885/cx23885-input.c
+++ b/drivers/media/video/cx23885/cx23885-input.c
@@ -397,7 +397,7 @@ int cx23885_input_init(struct cx23885_dev *dev)
         dev->ir_input = ir;
         cx23885_input_ir_start(dev);
 
-        ret = ir_input_register(ir->dev, ir_codes);
+        ret = ir_input_register(ir->dev, ir_codes, NULL);
         if (ret)
                 goto err_out_stop;
 
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index 8934d61cf660..2d3ac8b83dc3 100644
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/drivers/media/video/cx23885/cx23885-video.c
@@ -36,6 +36,7 @@
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
 #include "cx23885-ioctl.h"
+#include "tuner-xc2028.h"
 
 MODULE_DESCRIPTION("v4l2 driver module for cx23885 based TV cards");
 MODULE_AUTHOR("Steven Toth <stoth@linuxtv.org>");
@@ -1505,6 +1506,18 @@ int cx23885_video_register(struct cx23885_dev *dev)
                         tun_setup.tuner_callback = cx23885_tuner_callback;
 
                         v4l2_subdev_call(sd, tuner, s_type_addr, &tun_setup);
+
+                        if (dev->board == CX23885_BOARD_LEADTEK_WINFAST_PXTV1200) {
+                                struct xc2028_ctrl ctrl = {
+                                        .fname = XC2028_DEFAULT_FIRMWARE,
+                                        .max_len = 64
+                                };
+                                struct v4l2_priv_tun_config cfg = {
+                                        .tuner = dev->tuner_type,
+                                        .priv = &ctrl
+                                };
+                                v4l2_subdev_call(sd, tuner, s_config, &cfg);
+                        }
                 }
         }
 
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index 08b3f6b136a0..0e3a98d243c5 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -81,6 +81,7 @@
 #define CX23885_BOARD_COMPRO_VIDEOMATE_E800    25
 #define CX23885_BOARD_HAUPPAUGE_HVR1290        26
 #define CX23885_BOARD_MYGICA_X8558PRO          27
+#define CX23885_BOARD_LEADTEK_WINFAST_PXTV1200 28
 
 #define GPIO_0 0x00000001
 #define GPIO_1 0x00000002