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

Conflicts:
	litmus/sched_cedf.c

1 files changed, 38 insertions, 6 deletions

diff --git a/drivers/media/dvb/firewire/firedtv-fe.c b/drivers/media/dvb/firewire/firedtv-fe.c
index e49cdc88b0c7..8748a61be73d 100644
--- a/drivers/media/dvb/firewire/firedtv-fe.c
+++ b/drivers/media/dvb/firewire/firedtv-fe.c
@@ -36,14 +36,14 @@ static int fdtv_dvb_init(struct dvb_frontend *fe)
                 return err;
         }
 
-        return fdtv->backend->start_iso(fdtv);
+        return fdtv_start_iso(fdtv);
 }
 
 static int fdtv_sleep(struct dvb_frontend *fe)
 {
         struct firedtv *fdtv = fe->sec_priv;
 
-        fdtv->backend->stop_iso(fdtv);
+        fdtv_stop_iso(fdtv);
         cmp_break_pp_connection(fdtv, fdtv->subunit, fdtv->isochannel);
         fdtv->isochannel = -1;
         return 0;
@@ -155,7 +155,17 @@ static int fdtv_get_frontend(struct dvb_frontend *fe,
         return -EOPNOTSUPP;
 }
 
-void fdtv_frontend_init(struct firedtv *fdtv)
+static int fdtv_get_property(struct dvb_frontend *fe, struct dtv_property *tvp)
+{
+        return 0;
+}
+
+static int fdtv_set_property(struct dvb_frontend *fe, struct dtv_property *tvp)
+{
+        return 0;
+}
+
+void fdtv_frontend_init(struct firedtv *fdtv, const char *name)
 {
         struct dvb_frontend_ops *ops = &fdtv->fe.ops;
         struct dvb_frontend_info *fi = &ops->info;
@@ -166,6 +176,9 @@ void fdtv_frontend_init(struct firedtv *fdtv)
         ops->set_frontend               = fdtv_set_frontend;
         ops->get_frontend               = fdtv_get_frontend;
 
+        ops->get_property               = fdtv_get_property;
+        ops->set_property               = fdtv_set_property;
+
         ops->read_status                = fdtv_read_status;
         ops->read_ber                   = fdtv_read_ber;
         ops->read_signal_strength       = fdtv_read_signal_strength;
@@ -179,7 +192,6 @@ void fdtv_frontend_init(struct firedtv *fdtv)
 
         switch (fdtv->type) {
         case FIREDTV_DVB_S:
-        case FIREDTV_DVB_S2:
                 fi->type                = FE_QPSK;
 
                 fi->frequency_min       = 950000;
@@ -188,7 +200,7 @@ void fdtv_frontend_init(struct firedtv *fdtv)
                 fi->symbol_rate_min     = 1000000;
                 fi->symbol_rate_max     = 40000000;
 
-                fi->caps                = FE_CAN_INVERSION_AUTO |
+                fi->caps                = FE_CAN_INVERSION_AUTO |
                                           FE_CAN_FEC_1_2        |
                                           FE_CAN_FEC_2_3        |
                                           FE_CAN_FEC_3_4        |
@@ -198,6 +210,26 @@ void fdtv_frontend_init(struct firedtv *fdtv)
                                           FE_CAN_QPSK;
                 break;
 
+        case FIREDTV_DVB_S2:
+                fi->type                = FE_QPSK;
+
+                fi->frequency_min       = 950000;
+                fi->frequency_max       = 2150000;
+                fi->frequency_stepsize  = 125;
+                fi->symbol_rate_min     = 1000000;
+                fi->symbol_rate_max     = 40000000;
+
+                fi->caps                = FE_CAN_INVERSION_AUTO |
+                                          FE_CAN_FEC_1_2        |
+                                          FE_CAN_FEC_2_3        |
+                                          FE_CAN_FEC_3_4        |
+                                          FE_CAN_FEC_5_6        |
+                                          FE_CAN_FEC_7_8        |
+                                          FE_CAN_FEC_AUTO       |
+                                          FE_CAN_QPSK           |
+                                          FE_CAN_2G_MODULATION;
+                break;
+
         case FIREDTV_DVB_C:
                 fi->type                = FE_QAM;
 
@@ -234,7 +266,7 @@ void fdtv_frontend_init(struct firedtv *fdtv)
                 dev_err(fdtv->device, "no frontend for model type %d\n",
                         fdtv->type);
         }
-        strcpy(fi->name, fdtv_model_names[fdtv->type]);
+        strcpy(fi->name, name);
 
         fdtv->fe.dvb = &fdtv->adapter;
         fdtv->fe.sec_priv = fdtv;