Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 57 insertions, 31 deletions

diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index 13ac9e3ab121..926f299b5225 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -26,16 +26,15 @@
  * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
  *
  *
- * the project's page is at http://www.linuxtv.org/dvb/
+ * the project's page is at http://www.linuxtv.org/
  */
 
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/input.h>
 #include <linux/spinlock.h>
-#include <media/ir-core.h>
+#include <media/rc-core.h>
 
 #include "budget.h"
 
@@ -53,6 +52,7 @@
 #include "bsru6.h"
 #include "tda1002x.h"
 #include "tda827x.h"
+#include "bsbe1-d01a.h"
 
 #define MODULE_NAME "budget_ci"
 
@@ -96,13 +96,14 @@ MODULE_PARM_DESC(ir_debug, "enable debugging information for IR decoding");
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
 struct budget_ci_ir {
-        struct input_dev *dev;
+        struct rc_dev *dev;
         struct tasklet_struct msp430_irq_tasklet;
         char name[72]; /* 40 + 32 for (struct saa7146_dev).name */
         char phys[32];
         int rc5_device;
         u32 ir_key;
         bool have_command;
+        bool full_rc5;          /* Outputs a full RC5 code */
 };
 
 struct budget_ci {
@@ -118,7 +119,7 @@ struct budget_ci {
 static void msp430_ir_interrupt(unsigned long data)
 {
         struct budget_ci *budget_ci = (struct budget_ci *) data;
-        struct input_dev *dev = budget_ci->ir.dev;
+        struct rc_dev *dev = budget_ci->ir.dev;
         u32 command = ttpci_budget_debiread(&budget_ci->budget, DEBINOSWAP, DEBIADDR_IR, 2, 1, 0) >> 8;
 
         /*
@@ -155,24 +156,29 @@ static void msp430_ir_interrupt(unsigned long data)
                 return;
         budget_ci->ir.have_command = false;
 
-        /* FIXME: We should generate complete scancodes with device info */
         if (budget_ci->ir.rc5_device != IR_DEVICE_ANY &&
             budget_ci->ir.rc5_device != (command & 0x1f))
                 return;
 
-        ir_keydown(dev, budget_ci->ir.ir_key, (command & 0x20) ? 1 : 0);
+        if (budget_ci->ir.full_rc5) {
+                rc_keydown(dev,
+                           budget_ci->ir.rc5_device <<8 | budget_ci->ir.ir_key,
+                           (command & 0x20) ? 1 : 0);
+                return;
+        }
+
+        /* FIXME: We should generate complete scancodes for all devices */
+        rc_keydown(dev, budget_ci->ir.ir_key, (command & 0x20) ? 1 : 0);
 }
 
 static int msp430_ir_init(struct budget_ci *budget_ci)
 {
         struct saa7146_dev *saa = budget_ci->budget.dev;
-        struct input_dev *input_dev = budget_ci->ir.dev;
+        struct rc_dev *dev;
         int error;
-        char *ir_codes = NULL;
 
-
-        budget_ci->ir.dev = input_dev = input_allocate_device();
-        if (!input_dev) {
+        dev = rc_allocate_device();
+        if (!dev) {
                 printk(KERN_ERR "budget_ci: IR interface initialisation failed\n");
                 return -ENOMEM;
         }
@@ -182,19 +188,20 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
         snprintf(budget_ci->ir.phys, sizeof(budget_ci->ir.phys),
                  "pci-%s/ir0", pci_name(saa->pci));
 
-        input_dev->name = budget_ci->ir.name;
-
-        input_dev->phys = budget_ci->ir.phys;
-        input_dev->id.bustype = BUS_PCI;
-        input_dev->id.version = 1;
+        dev->driver_name = MODULE_NAME;
+        dev->input_name = budget_ci->ir.name;
+        dev->input_phys = budget_ci->ir.phys;
+        dev->input_id.bustype = BUS_PCI;
+        dev->input_id.version = 1;
+        dev->scanmask = 0xff;
         if (saa->pci->subsystem_vendor) {
-                input_dev->id.vendor = saa->pci->subsystem_vendor;
-                input_dev->id.product = saa->pci->subsystem_device;
+                dev->input_id.vendor = saa->pci->subsystem_vendor;
+                dev->input_id.product = saa->pci->subsystem_device;
         } else {
-                input_dev->id.vendor = saa->pci->vendor;
-                input_dev->id.product = saa->pci->device;
+                dev->input_id.vendor = saa->pci->vendor;
+                dev->input_id.product = saa->pci->device;
         }
-        input_dev->dev.parent = &saa->pci->dev;
+        dev->dev.parent = &saa->pci->dev;
 
         if (rc5_device < 0)
                 budget_ci->ir.rc5_device = IR_DEVICE_ANY;
@@ -208,7 +215,8 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
         case 0x1011:
         case 0x1012:
                 /* The hauppauge keymap is a superset of these remotes */
-                ir_codes = RC_MAP_HAUPPAUGE_NEW;
+                dev->map_name = RC_MAP_HAUPPAUGE;
+                budget_ci->ir.full_rc5 = true;
 
                 if (rc5_device < 0)
                         budget_ci->ir.rc5_device = 0x1f;
@@ -217,24 +225,24 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
         case 0x1017:
         case 0x1019:
         case 0x101a:
+        case 0x101b:
                 /* for the Technotrend 1500 bundled remote */
-                ir_codes = RC_MAP_TT_1500;
+                dev->map_name = RC_MAP_TT_1500;
                 break;
         default:
                 /* unknown remote */
-                ir_codes = RC_MAP_BUDGET_CI_OLD;
+                dev->map_name = RC_MAP_BUDGET_CI_OLD;
                 break;
         }
 
-        error = ir_input_register(input_dev, ir_codes, NULL, MODULE_NAME);
+        error = rc_register_device(dev);
         if (error) {
                 printk(KERN_ERR "budget_ci: could not init driver for IR device (code %d)\n", error);
+                rc_free_device(dev);
                 return error;
         }
 
-        /* note: these must be after input_register_device */
-        input_dev->rep[REP_DELAY] = 400;
-        input_dev->rep[REP_PERIOD] = 250;
+        budget_ci->ir.dev = dev;
 
         tasklet_init(&budget_ci->ir.msp430_irq_tasklet, msp430_ir_interrupt,
                      (unsigned long) budget_ci);
@@ -248,13 +256,12 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
 static void msp430_ir_deinit(struct budget_ci *budget_ci)
 {
         struct saa7146_dev *saa = budget_ci->budget.dev;
-        struct input_dev *dev = budget_ci->ir.dev;
 
         SAA7146_IER_DISABLE(saa, MASK_06);
         saa7146_setgpio(saa, 3, SAA7146_GPIO_INPUT);
         tasklet_kill(&budget_ci->ir.msp430_irq_tasklet);
 
-        ir_input_unregister(dev);
+        rc_unregister_device(budget_ci->ir.dev);
 }
 
 static int ciintf_read_attribute_mem(struct dvb_ca_en50221 *ca, int slot, int address)
@@ -1383,6 +1390,23 @@ static void frontend_init(struct budget_ci *budget_ci)
                 }
                 break;
 
+        case 0x101b: /* TT S-1500B (BSBE1-D01A - STV0288/STB6000/LNBP21) */
+                budget_ci->budget.dvb_frontend = dvb_attach(stv0288_attach, &stv0288_bsbe1_d01a_config, &budget_ci->budget.i2c_adap);
+                if (budget_ci->budget.dvb_frontend) {
+                        if (dvb_attach(stb6000_attach, budget_ci->budget.dvb_frontend, 0x63, &budget_ci->budget.i2c_adap)) {
+                                if (!dvb_attach(lnbp21_attach, budget_ci->budget.dvb_frontend, &budget_ci->budget.i2c_adap, 0, 0)) {
+                                        printk(KERN_ERR "%s: No LNBP21 found!\n", __func__);
+                                        dvb_frontend_detach(budget_ci->budget.dvb_frontend);
+                                        budget_ci->budget.dvb_frontend = NULL;
+                                }
+                        } else {
+                                printk(KERN_ERR "%s: No STB6000 found!\n", __func__);
+                                dvb_frontend_detach(budget_ci->budget.dvb_frontend);
+                                budget_ci->budget.dvb_frontend = NULL;
+                        }
+                }
+                break;
+
         case 0x1019:            // TT S2-3200 PCI
                 /*
                  * NOTE! on some STB0899 versions, the internal PLL takes a longer time
@@ -1513,6 +1537,7 @@ MAKE_BUDGET_INFO(ttbtci, "TT-Budget-T-CI PCI", BUDGET_TT);
 MAKE_BUDGET_INFO(ttbcci, "TT-Budget-C-CI PCI", BUDGET_TT);
 MAKE_BUDGET_INFO(ttc1501, "TT-Budget C-1501 PCI", BUDGET_TT);
 MAKE_BUDGET_INFO(tt3200, "TT-Budget S2-3200 PCI", BUDGET_TT);
+MAKE_BUDGET_INFO(ttbs1500b, "TT-Budget S-1500B PCI", BUDGET_TT);
 
 static struct pci_device_id pci_tbl[] = {
         MAKE_EXTENSION_PCI(ttbci, 0x13c2, 0x100c),
@@ -1523,6 +1548,7 @@ static struct pci_device_id pci_tbl[] = {
         MAKE_EXTENSION_PCI(ttbs2, 0x13c2, 0x1017),
         MAKE_EXTENSION_PCI(ttc1501, 0x13c2, 0x101a),
         MAKE_EXTENSION_PCI(tt3200, 0x13c2, 0x1019),
+        MAKE_EXTENSION_PCI(ttbs1500b, 0x13c2, 0x101b),
         {
          .vendor = 0,
          }