[media] DVB: Add basic API support for DVB-T2 and bump minor version

[steve@stevekerrison.com: Remove private definitions from cxd2820r that existed before API was defined]
Signed-off-by: Andreas Oberritter <obi@linuxtv.org>
Signed-off-by: Steve Kerrison <steve@stevekerrison.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

3 files changed, 12 insertions, 16 deletions

diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 95c3fec6ae40..3639edce65e0 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -1148,10 +1148,9 @@ static void dtv_property_adv_params_sync(struct dvb_frontend *fe)
                 break;
         }
 
-        if(c->delivery_system == SYS_ISDBT) {
-                /* Fake out a generic DVB-T request so we pass validation in the ioctl */
-                p->frequency = c->frequency;
-                p->inversion = c->inversion;
+        /* Fake out a generic DVB-T request so we pass validation in the ioctl */
+        if ((c->delivery_system == SYS_ISDBT) ||
+            (c->delivery_system == SYS_DVBT2)) {
                 p->u.ofdm.constellation = QAM_AUTO;
                 p->u.ofdm.code_rate_HP = FEC_AUTO;
                 p->u.ofdm.code_rate_LP = FEC_AUTO;
@@ -1324,6 +1323,9 @@ static int dtv_property_process_get(struct dvb_frontend *fe,
         case DTV_ISDBS_TS_ID:
                 tvp->u.data = fe->dtv_property_cache.isdbs_ts_id;
                 break;
+        case DTV_DVBT2_PLP_ID:
+                tvp->u.data = fe->dtv_property_cache.dvbt2_plp_id;
+                break;
         default:
                 return -EINVAL;
         }
@@ -1479,6 +1481,9 @@ static int dtv_property_process_set(struct dvb_frontend *fe,
         case DTV_ISDBS_TS_ID:
                 fe->dtv_property_cache.isdbs_ts_id = tvp->u.data;
                 break;
+        case DTV_DVBT2_PLP_ID:
+                fe->dtv_property_cache.dvbt2_plp_id = tvp->u.data;
+                break;
         default:
                 return -EINVAL;
         }
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h
index 3b860504bf04..5590eb6eb408 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.h
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.h
@@ -358,6 +358,9 @@ struct dtv_frontend_properties {
 
         /* ISDB-T specifics */
         u32                     isdbs_ts_id;
+
+        /* DVB-T2 specifics */
+        u32                     dvbt2_plp_id;
 };
 
 struct dvb_frontend {
diff --git a/drivers/media/dvb/frontends/cxd2820r_priv.h b/drivers/media/dvb/frontends/cxd2820r_priv.h
index d4e2e0b76c10..25adbeefa6d3 100644
--- a/drivers/media/dvb/frontends/cxd2820r_priv.h
+++ b/drivers/media/dvb/frontends/cxd2820r_priv.h
@@ -40,18 +40,6 @@
 #undef warn
 #define warn(f, arg...) printk(KERN_WARNING LOG_PREFIX": " f "\n" , ## arg)
 
-/*
- * FIXME: These are totally wrong and must be added properly to the API.
- * Only temporary solution in order to get driver compile.
- */
-#define SYS_DVBT2             SYS_DAB
-#define TRANSMISSION_MODE_1K  0
-#define TRANSMISSION_MODE_16K 0
-#define TRANSMISSION_MODE_32K 0
-#define GUARD_INTERVAL_1_128  0
-#define GUARD_INTERVAL_19_128 0
-#define GUARD_INTERVAL_19_256 0
-
 struct reg_val_mask {
         u32 reg;
         u8  val;