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

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (348 commits)
  [media] pctv452e: Remove bogus code
  [media] adv7175: Make use of media bus pixel codes
  [media] media: vb2: fix incorrect return value
  [media] em28xx: implement VIDIOC_ENUM_FRAMESIZES
  [media] cx23885: Stop the risc video fifo before reconfiguring it
  [media] cx23885: Avoid incorrect error handling and reporting
  [media] cx23885: Avoid stopping the risc engine during buffer timeout
  [media] cx23885: Removed a spurious function cx23885_set_scale()
  [media] cx23885: v4l2 api compliance, set the audioset field correctly
  [media] cx23885: hook the audio selection functions into the main driver
  [media] cx23885: add generic functions for dealing with audio input selection
  [media] cx23885: fixes related to maximum number of inputs and range checking
  [media] cx23885: Initial support for the MPX-885 mini-card
  [media] cx25840: Ensure AUDIO6 and AUDIO7 trigger line-in baseband use
  [media] cx23885: Enable audio line in support from the back panel
  [media] cx23885: Allow the audio mux config to be specified on a per input basis
  [media] cx25840: Enable support for non-tuner LR1/LR2 audio inputs
  [media] cx23885: Name an internal i2c part and declare a bitfield by name
  [media] cx23885: Ensure VBI buffers timeout quickly - bugfix for vbi hangs during streaming
  [media] cx23885: remove channel dump diagnostics when a vbi buffer times out
  ...

Fix up trivial conflicts in drivers/misc/altera-stapl/altera.c (header
file rename vs add)

8 files changed, 77 insertions, 40 deletions

diff --git a/drivers/media/dvb/ttpci/Makefile b/drivers/media/dvb/ttpci/Makefile
index 8a4d5bb20a5..f6e869372e3 100644
--- a/drivers/media/dvb/ttpci/Makefile
+++ b/drivers/media/dvb/ttpci/Makefile
@@ -17,5 +17,5 @@ obj-$(CONFIG_DVB_BUDGET_CI) += budget-ci.o
 obj-$(CONFIG_DVB_BUDGET_PATCH) += budget-patch.o
 obj-$(CONFIG_DVB_AV7110) += dvb-ttpci.o
 
-EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
-EXTRA_CFLAGS += -Idrivers/media/common/tuners
+ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
+ccflags-y += -Idrivers/media/common/tuners
diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c
index cdd31cae46c..ee8ee1d481f 100644
--- a/drivers/media/dvb/ttpci/av7110_v4l.c
+++ b/drivers/media/dvb/ttpci/av7110_v4l.c
@@ -25,6 +25,8 @@
  * the project's page is at http://www.linuxtv.org/ 
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/delay.h>
@@ -253,7 +255,7 @@ static int av7110_dvb_c_switch(struct saa7146_fh *fh)
 
                 switch (av7110->current_input) {
                 case 1:
-                        dprintk(1, "switching SAA7113 to Analog Tuner Input.\n");
+                        dprintk(1, "switching SAA7113 to Analog Tuner Input\n");
                         msp_writereg(av7110, MSP_WR_DSP, 0x0008, 0x0000); // loudspeaker source
                         msp_writereg(av7110, MSP_WR_DSP, 0x0009, 0x0000); // headphone source
                         msp_writereg(av7110, MSP_WR_DSP, 0x000a, 0x0000); // SCART 1 source
@@ -263,7 +265,7 @@ static int av7110_dvb_c_switch(struct saa7146_fh *fh)
 
                         if (av7110->analog_tuner_flags & ANALOG_TUNER_VES1820) {
                                 if (ves1820_writereg(dev, 0x09, 0x0f, 0x60))
-                                        dprintk(1, "setting band in demodulator failed.\n");
+                                        dprintk(1, "setting band in demodulator failed\n");
                         } else if (av7110->analog_tuner_flags & ANALOG_TUNER_STV0297) {
                                 saa7146_setgpio(dev, 1, SAA7146_GPIO_OUTHI); // TDA9819 pin9(STD)
                                 saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTHI); // TDA9819 pin30(VIF)
@@ -272,17 +274,17 @@ static int av7110_dvb_c_switch(struct saa7146_fh *fh)
                                 dprintk(1, "saa7113 write failed @ card %d", av7110->dvb_adapter.num);
                         break;
                 case 2:
-                        dprintk(1, "switching SAA7113 to Video AV CVBS Input.\n");
+                        dprintk(1, "switching SAA7113 to Video AV CVBS Input\n");
                         if (i2c_writereg(av7110, 0x48, 0x02, 0xd2) != 1)
                                 dprintk(1, "saa7113 write failed @ card %d", av7110->dvb_adapter.num);
                         break;
                 case 3:
-                        dprintk(1, "switching SAA7113 to Video AV Y/C Input.\n");
+                        dprintk(1, "switching SAA7113 to Video AV Y/C Input\n");
                         if (i2c_writereg(av7110, 0x48, 0x02, 0xd9) != 1)
                                 dprintk(1, "saa7113 write failed @ card %d", av7110->dvb_adapter.num);
                         break;
                 default:
-                        dprintk(1, "switching SAA7113 to Input: AV7110: SAA7113: invalid input.\n");
+                        dprintk(1, "switching SAA7113 to Input: AV7110: SAA7113: invalid input\n");
                 }
         } else {
                 adswitch = 0;
@@ -299,7 +301,7 @@ static int av7110_dvb_c_switch(struct saa7146_fh *fh)
 
                 if (av7110->analog_tuner_flags & ANALOG_TUNER_VES1820) {
                         if (ves1820_writereg(dev, 0x09, 0x0f, 0x20))
-                                dprintk(1, "setting band in demodulator failed.\n");
+                                dprintk(1, "setting band in demodulator failed\n");
                 } else if (av7110->analog_tuner_flags & ANALOG_TUNER_STV0297) {
                         saa7146_setgpio(dev, 1, SAA7146_GPIO_OUTLO); // TDA9819 pin9(STD)
                         saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO); // TDA9819 pin30(VIF)
@@ -413,7 +415,7 @@ static int vidioc_g_frequency(struct file *file, void *fh, struct v4l2_frequency
         struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;
         struct av7110 *av7110 = (struct av7110 *)dev->ext_priv;
 
-        dprintk(2, "VIDIOC_G_FREQ: freq:0x%08x.\n", f->frequency);
+        dprintk(2, "VIDIOC_G_FREQ: freq:0x%08x\n", f->frequency);
 
         if (!av7110->analog_tuner_flags || av7110->current_input != 1)
                 return -EINVAL;
@@ -429,7 +431,7 @@ static int vidioc_s_frequency(struct file *file, void *fh, struct v4l2_frequency
         struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;
         struct av7110 *av7110 = (struct av7110 *)dev->ext_priv;
 
-        dprintk(2, "VIDIOC_S_FREQUENCY: freq:0x%08x.\n", f->frequency);
+        dprintk(2, "VIDIOC_S_FREQUENCY: freq:0x%08x\n", f->frequency);
 
         if (!av7110->analog_tuner_flags || av7110->current_input != 1)
                 return -EINVAL;
@@ -689,12 +691,12 @@ int av7110_init_analog_module(struct av7110 *av7110)
 
         if (i2c_writereg(av7110, 0x80, 0x0, 0x80) == 1 &&
             i2c_writereg(av7110, 0x80, 0x0, 0) == 1) {
-                printk("dvb-ttpci: DVB-C analog module @ card %d detected, initializing MSP3400\n",
+                pr_info("DVB-C analog module @ card %d detected, initializing MSP3400\n",
                         av7110->dvb_adapter.num);
                 av7110->adac_type = DVB_ADAC_MSP34x0;
         } else if (i2c_writereg(av7110, 0x84, 0x0, 0x80) == 1 &&
                    i2c_writereg(av7110, 0x84, 0x0, 0) == 1) {
-                printk("dvb-ttpci: DVB-C analog module @ card %d detected, initializing MSP3415\n",
+                pr_info("DVB-C analog module @ card %d detected, initializing MSP3415\n",
                         av7110->dvb_adapter.num);
                 av7110->adac_type = DVB_ADAC_MSP34x5;
         } else
@@ -715,7 +717,7 @@ int av7110_init_analog_module(struct av7110 *av7110)
         msp_writereg(av7110, MSP_WR_DSP, 0x000d, 0x1900); // prescale SCART
 
         if (i2c_writereg(av7110, 0x48, 0x01, 0x00)!=1) {
-                INFO(("saa7113 not accessible.\n"));
+                pr_info("saa7113 not accessible\n");
         } else {
                 u8 *i = saa7113_init_regs;
 
@@ -733,7 +735,7 @@ int av7110_init_analog_module(struct av7110 *av7110)
                 /* setup for DVB by default */
                 if (av7110->analog_tuner_flags & ANALOG_TUNER_VES1820) {
                         if (ves1820_writereg(av7110->dev, 0x09, 0x0f, 0x20))
-                                dprintk(1, "setting band in demodulator failed.\n");
+                                dprintk(1, "setting band in demodulator failed\n");
                 } else if (av7110->analog_tuner_flags & ANALOG_TUNER_STV0297) {
                         saa7146_setgpio(av7110->dev, 1, SAA7146_GPIO_OUTLO); // TDA9819 pin9(STD)
                         saa7146_setgpio(av7110->dev, 3, SAA7146_GPIO_OUTLO); // TDA9819 pin30(VIF)
@@ -797,7 +799,7 @@ int av7110_init_v4l(struct av7110 *av7110)
         ret = saa7146_vv_init(dev, vv_data);
 
         if (ret) {
-                ERR(("cannot init capture device. skipping.\n"));
+                ERR("cannot init capture device. skipping\n");
                 return -ENODEV;
         }
         vv_data->ops.vidioc_enum_input = vidioc_enum_input;
@@ -814,12 +816,12 @@ int av7110_init_v4l(struct av7110 *av7110)
         vv_data->ops.vidioc_s_fmt_sliced_vbi_out = vidioc_s_fmt_sliced_vbi_out;
 
         if (saa7146_register_device(&av7110->v4l_dev, dev, "av7110", VFL_TYPE_GRABBER)) {
-                ERR(("cannot register capture device. skipping.\n"));
+                ERR("cannot register capture device. skipping\n");
                 saa7146_vv_release(dev);
                 return -ENODEV;
         }
         if (saa7146_register_device(&av7110->vbi_dev, dev, "av7110", VFL_TYPE_VBI))
-                ERR(("cannot register vbi v4l2 device. skipping.\n"));
+                ERR("cannot register vbi v4l2 device. skipping\n");
         return 0;
 }
 
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c
index e957d7690bc..78d32f7e49f 100644
--- a/drivers/media/dvb/ttpci/budget-av.c
+++ b/drivers/media/dvb/ttpci/budget-av.c
@@ -33,6 +33,8 @@
  * the project's page is at http://www.linuxtv.org/ 
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include "budget.h"
 #include "stv0299.h"
 #include "stb0899_drv.h"
@@ -149,7 +151,7 @@ static int ciintf_read_attribute_mem(struct dvb_ca_en50221 *ca, int slot, int ad
         result = ttpci_budget_debiread(&budget_av->budget, DEBICICAM, address & 0xfff, 1, 0, 1);
         if (result == -ETIMEDOUT) {
                 ciintf_slot_shutdown(ca, slot);
-                printk(KERN_INFO "budget-av: cam ejected 1\n");
+                pr_info("cam ejected 1\n");
         }
         return result;
 }
@@ -168,7 +170,7 @@ static int ciintf_write_attribute_mem(struct dvb_ca_en50221 *ca, int slot, int a
         result = ttpci_budget_debiwrite(&budget_av->budget, DEBICICAM, address & 0xfff, 1, value, 0, 1);
         if (result == -ETIMEDOUT) {
                 ciintf_slot_shutdown(ca, slot);
-                printk(KERN_INFO "budget-av: cam ejected 2\n");
+                pr_info("cam ejected 2\n");
         }
         return result;
 }
@@ -187,7 +189,7 @@ static int ciintf_read_cam_control(struct dvb_ca_en50221 *ca, int slot, u8 addre
         result = ttpci_budget_debiread(&budget_av->budget, DEBICICAM, address & 3, 1, 0, 0);
         if (result == -ETIMEDOUT) {
                 ciintf_slot_shutdown(ca, slot);
-                printk(KERN_INFO "budget-av: cam ejected 3\n");
+                pr_info("cam ejected 3\n");
                 return -ETIMEDOUT;
         }
         return result;
@@ -207,7 +209,7 @@ static int ciintf_write_cam_control(struct dvb_ca_en50221 *ca, int slot, u8 addr
         result = ttpci_budget_debiwrite(&budget_av->budget, DEBICICAM, address & 3, 1, value, 0, 0);
         if (result == -ETIMEDOUT) {
                 ciintf_slot_shutdown(ca, slot);
-                printk(KERN_INFO "budget-av: cam ejected 5\n");
+                pr_info("cam ejected 5\n");
         }
         return result;
 }
@@ -289,7 +291,7 @@ static int ciintf_poll_slot_status(struct dvb_ca_en50221 *ca, int slot, int open
                 if (saa7146_read(saa, PSR) & MASK_06) {
                         if (budget_av->slot_status == SLOTSTATUS_NONE) {
                                 budget_av->slot_status = SLOTSTATUS_PRESENT;
-                                printk(KERN_INFO "budget-av: cam inserted A\n");
+                                pr_info("cam inserted A\n");
                         }
                 }
                 saa7146_setgpio(saa, 3, SAA7146_GPIO_OUTLO);
@@ -306,11 +308,11 @@ static int ciintf_poll_slot_status(struct dvb_ca_en50221 *ca, int slot, int open
                 result = ttpci_budget_debiread(&budget_av->budget, DEBICICAM, 0, 1, 0, 1);
                 if ((result >= 0) && (budget_av->slot_status == SLOTSTATUS_NONE)) {
                         budget_av->slot_status = SLOTSTATUS_PRESENT;
-                        printk(KERN_INFO "budget-av: cam inserted B\n");
+                        pr_info("cam inserted B\n");
                 } else if (result < 0) {
                         if (budget_av->slot_status != SLOTSTATUS_NONE) {
                                 ciintf_slot_shutdown(ca, slot);
-                                printk(KERN_INFO "budget-av: cam ejected 5\n");
+                                pr_info("cam ejected 5\n");
                                 return 0;
                         }
                 }
@@ -365,11 +367,11 @@ static int ciintf_init(struct budget_av *budget_av)
 
         if ((result = dvb_ca_en50221_init(&budget_av->budget.dvb_adapter,
                                           &budget_av->ca, 0, 1)) != 0) {
-                printk(KERN_ERR "budget-av: ci initialisation failed.\n");
+                pr_err("ci initialisation failed\n");
                 goto error;
         }
 
-        printk(KERN_INFO "budget-av: ci interface initialised.\n");
+        pr_info("ci interface initialised\n");
         return 0;
 
 error:
@@ -896,7 +898,6 @@ static const struct stb0899_s1_reg knc1_stb0899_s1_init_1[] = {
         { STB0899_DISRX_ST0             , 0x04 },
         { STB0899_DISRX_ST1             , 0x00 },
         { STB0899_DISPARITY             , 0x00 },
-        { STB0899_DISFIFO               , 0x00 },
         { STB0899_DISSTATUS             , 0x20 },
         { STB0899_DISF22                , 0x8c },
         { STB0899_DISF22RX              , 0x9a },
@@ -1197,6 +1198,7 @@ static u8 read_pwm(struct budget_av *budget_av)
 #define SUBID_DVBC_KNC1                 0x0020
 #define SUBID_DVBC_KNC1_PLUS            0x0021
 #define SUBID_DVBC_KNC1_MK3             0x0022
+#define SUBID_DVBC_KNC1_TDA10024        0x0028
 #define SUBID_DVBC_KNC1_PLUS_MK3        0x0023
 #define SUBID_DVBC_CINERGY1200          0x1156
 #define SUBID_DVBC_CINERGY1200_MK3      0x1176
@@ -1316,6 +1318,7 @@ static void frontend_init(struct budget_av *budget_av)
         case SUBID_DVBC_EASYWATCH_MK3:
         case SUBID_DVBC_CINERGY1200_MK3:
         case SUBID_DVBC_KNC1_MK3:
+        case SUBID_DVBC_KNC1_TDA10024:
         case SUBID_DVBC_KNC1_PLUS_MK3:
                 budget_av->reinitialise_demod = 1;
                 budget_av->budget.dev->i2c_bitrate = SAA7146_I2C_BUS_BIT_RATE_240;
@@ -1343,8 +1346,7 @@ static void frontend_init(struct budget_av *budget_av)
         }
 
         if (fe == NULL) {
-                printk(KERN_ERR "budget-av: A frontend driver was not found "
-                                "for device [%04x:%04x] subsystem [%04x:%04x]\n",
+                pr_err("A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n",
                        saa->pci->vendor,
                        saa->pci->device,
                        saa->pci->subsystem_vendor,
@@ -1356,7 +1358,7 @@ static void frontend_init(struct budget_av *budget_av)
 
         if (dvb_register_frontend(&budget_av->budget.dvb_adapter,
                                   budget_av->budget.dvb_frontend)) {
-                printk(KERN_ERR "budget-av: Frontend registration failed!\n");
+                pr_err("Frontend registration failed!\n");
                 dvb_frontend_detach(budget_av->budget.dvb_frontend);
                 budget_av->budget.dvb_frontend = NULL;
         }
@@ -1414,7 +1416,7 @@ static struct v4l2_input knc1_inputs[KNC1_INPUTS] = {
 
 static int vidioc_enum_input(struct file *file, void *fh, struct v4l2_input *i)
 {
-        dprintk(1, "VIDIOC_ENUMINPUT %d.\n", i->index);
+        dprintk(1, "VIDIOC_ENUMINPUT %d\n", i->index);
         if (i->index >= KNC1_INPUTS)
                 return -EINVAL;
         memcpy(i, &knc1_inputs[i->index], sizeof(struct v4l2_input));
@@ -1428,7 +1430,7 @@ static int vidioc_g_input(struct file *file, void *fh, unsigned int *i)
 
         *i = budget_av->cur_input;
 
-        dprintk(1, "VIDIOC_G_INPUT %d.\n", *i);
+        dprintk(1, "VIDIOC_G_INPUT %d\n", *i);
         return 0;
 }
 
@@ -1437,7 +1439,7 @@ static int vidioc_s_input(struct file *file, void *fh, unsigned int input)
         struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;
         struct budget_av *budget_av = (struct budget_av *)dev->ext_priv;
 
-        dprintk(1, "VIDIOC_S_INPUT %d.\n", input);
+        dprintk(1, "VIDIOC_S_INPUT %d\n", input);
         return saa7113_setinput(budget_av, input);
 }
 
@@ -1476,7 +1478,7 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
 
                 if (0 != saa7146_vv_init(dev, &vv_data)) {
                         /* fixme: proper cleanup here */
-                        ERR(("cannot init vv subsystem.\n"));
+                        ERR("cannot init vv subsystem\n");
                         return err;
                 }
                 vv_data.ops.vidioc_enum_input = vidioc_enum_input;
@@ -1485,7 +1487,7 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
 
                 if ((err = saa7146_register_device(&budget_av->vd, dev, "knc1", VFL_TYPE_GRABBER))) {
                         /* fixme: proper cleanup here */
-                        ERR(("cannot register capture v4l2 device.\n"));
+                        ERR("cannot register capture v4l2 device\n");
                         saa7146_vv_release(dev);
                         return err;
                 }
@@ -1502,13 +1504,12 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
 
         mac = budget_av->budget.dvb_adapter.proposed_mac;
         if (i2c_readregs(&budget_av->budget.i2c_adap, 0xa0, 0x30, mac, 6)) {
-                printk(KERN_ERR "KNC1-%d: Could not read MAC from KNC1 card\n",
+                pr_err("KNC1-%d: Could not read MAC from KNC1 card\n",
                        budget_av->budget.dvb_adapter.num);
                 memset(mac, 0, 6);
         } else {
-                printk(KERN_INFO "KNC1-%d: MAC addr = %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
-                       budget_av->budget.dvb_adapter.num,
-                       mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+                pr_info("KNC1-%d: MAC addr = %pM\n",
+                        budget_av->budget.dvb_adapter.num, mac);
         }
 
         budget_av->budget.dvb_adapter.priv = budget_av;
@@ -1558,6 +1559,7 @@ MAKE_BUDGET_INFO(knc1sp, "KNC1 DVB-S Plus", BUDGET_KNC1SP);
 MAKE_BUDGET_INFO(knc1spx4, "KNC1 DVB-S Plus X4", BUDGET_KNC1SP);
 MAKE_BUDGET_INFO(knc1cp, "KNC1 DVB-C Plus", BUDGET_KNC1CP);
 MAKE_BUDGET_INFO(knc1cmk3, "KNC1 DVB-C MK3", BUDGET_KNC1C_MK3);
+MAKE_BUDGET_INFO(knc1ctda10024, "KNC1 DVB-C TDA10024", BUDGET_KNC1C_TDA10024);
 MAKE_BUDGET_INFO(knc1cpmk3, "KNC1 DVB-C Plus MK3", BUDGET_KNC1CP_MK3);
 MAKE_BUDGET_INFO(knc1tp, "KNC1 DVB-T Plus", BUDGET_KNC1TP);
 MAKE_BUDGET_INFO(cin1200s, "TerraTec Cinergy 1200 DVB-S", BUDGET_CIN1200S);
@@ -1587,6 +1589,7 @@ static struct pci_device_id pci_tbl[] = {
         MAKE_EXTENSION_PCI(knc1c, 0x1894, 0x0020),
         MAKE_EXTENSION_PCI(knc1cp, 0x1894, 0x0021),
         MAKE_EXTENSION_PCI(knc1cmk3, 0x1894, 0x0022),
+        MAKE_EXTENSION_PCI(knc1ctda10024, 0x1894, 0x0028),
         MAKE_EXTENSION_PCI(knc1cpmk3, 0x1894, 0x0023),
         MAKE_EXTENSION_PCI(knc1t, 0x1894, 0x0030),
         MAKE_EXTENSION_PCI(knc1tp, 0x1894, 0x0031),
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index 926f299b522..ca02e972217 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -1053,7 +1053,6 @@ static const struct stb0899_s1_reg tt3200_stb0899_s1_init_1[] = {
         { STB0899_DISRX_ST0             , 0x04 },
         { STB0899_DISRX_ST1             , 0x00 },
         { STB0899_DISPARITY             , 0x00 },
-        { STB0899_DISFIFO               , 0x00 },
         { STB0899_DISSTATUS             , 0x20 },
         { STB0899_DISF22                , 0x8c },
         { STB0899_DISF22RX              , 0x9a },
diff --git a/drivers/media/dvb/ttpci/budget-core.c b/drivers/media/dvb/ttpci/budget-core.c
index 37666d4edab..37d02fe0913 100644
--- a/drivers/media/dvb/ttpci/budget-core.c
+++ b/drivers/media/dvb/ttpci/budget-core.c
@@ -110,6 +110,7 @@ static int start_ts_capture(struct budget *budget)
                 break;
         case BUDGET_CIN1200C_MK3:
         case BUDGET_KNC1C_MK3:
+        case BUDGET_KNC1C_TDA10024:
         case BUDGET_KNC1CP_MK3:
                 if (budget->video_port == BUDGET_VIDEO_PORTA) {
                         saa7146_write(dev, DD1_INIT, 0x06000200);
@@ -434,6 +435,7 @@ int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,
         case BUDGET_KNC1CP:
         case BUDGET_CIN1200C:
         case BUDGET_KNC1C_MK3:
+        case BUDGET_KNC1C_TDA10024:
         case BUDGET_KNC1CP_MK3:
         case BUDGET_CIN1200C_MK3:
                 budget->buffer_width = TS_WIDTH_DVBC;
diff --git a/drivers/media/dvb/ttpci/budget.h b/drivers/media/dvb/ttpci/budget.h
index 3ad0c6789ba..3d8a806c20b 100644
--- a/drivers/media/dvb/ttpci/budget.h
+++ b/drivers/media/dvb/ttpci/budget.h
@@ -104,6 +104,7 @@ static struct saa7146_pci_extension_data x_var = { \
 #define BUDGET_KNC1C_MK3           16
 #define BUDGET_KNC1CP_MK3          17
 #define BUDGET_KNC1S2              18
+#define BUDGET_KNC1C_TDA10024      19
 
 #define BUDGET_VIDEO_PORTA         0
 #define BUDGET_VIDEO_PORTB         1
diff --git a/drivers/media/dvb/ttpci/ttpci-eeprom.c b/drivers/media/dvb/ttpci/ttpci-eeprom.c
index 7dd54b3026a..32d43156c54 100644
--- a/drivers/media/dvb/ttpci/ttpci-eeprom.c
+++ b/drivers/media/dvb/ttpci/ttpci-eeprom.c
@@ -85,6 +85,35 @@ static int getmac_tt(u8 * decodedMAC, u8 * encodedMAC)
         return 0;
 }
 
+int ttpci_eeprom_decode_mac(u8 *decodedMAC, u8 *encodedMAC)
+{
+        u8 xor[20] = { 0x72, 0x23, 0x68, 0x19, 0x5c, 0xa8, 0x71, 0x2c,
+                       0x54, 0xd3, 0x7b, 0xf1, 0x9E, 0x23, 0x16, 0xf6,
+                       0x1d, 0x36, 0x64, 0x78};
+        u8 data[20];
+        int i;
+
+        memcpy(data, encodedMAC, 20);
+
+        for (i = 0; i < 20; i++)
+                data[i] ^= xor[i];
+        for (i = 0; i < 10; i++)
+                data[i] = ((data[2 * i + 1] << 8) | data[2 * i])
+                        >> ((data[2 * i + 1] >> 6) & 3);
+
+        if (check_mac_tt(data))
+                return -ENODEV;
+
+        decodedMAC[0] = data[2];
+        decodedMAC[1] = data[1];
+        decodedMAC[2] = data[0];
+        decodedMAC[3] = data[6];
+        decodedMAC[4] = data[5];
+        decodedMAC[5] = data[4];
+        return 0;
+}
+EXPORT_SYMBOL(ttpci_eeprom_decode_mac);
+
 static int ttpci_eeprom_read_encodedMAC(struct i2c_adapter *adapter, u8 * encodedMAC)
 {
         int ret;
diff --git a/drivers/media/dvb/ttpci/ttpci-eeprom.h b/drivers/media/dvb/ttpci/ttpci-eeprom.h
index e2dc6cfe205..dcc33d5a5cb 100644
--- a/drivers/media/dvb/ttpci/ttpci-eeprom.h
+++ b/drivers/media/dvb/ttpci/ttpci-eeprom.h
@@ -28,6 +28,7 @@
 #include <linux/types.h>
 #include <linux/i2c.h>
 
+extern int ttpci_eeprom_decode_mac(u8 *decodedMAC, u8 *encodedMAC);
 extern int ttpci_eeprom_parse_mac(struct i2c_adapter *adapter, u8 *propsed_mac);
 
 #endif