[media] add DTMB support for DVB API

Cc: Patrick Boettcher <pboettcher@kernellabs.com>
Cc: Andreas Oberritter <obi@linuxtv.org>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Acked-by: Patrick Boettcher <pboettcher@kernellabs.com>
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

5 files changed, 16 insertions, 6 deletions

diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 746dfd86aeab..3a0f24547196 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -179,7 +179,7 @@ static enum dvbv3_emulation_type dvbv3_type(u32 delivery_system)
         case SYS_DVBT:
         case SYS_DVBT2:
         case SYS_ISDBT:
-        case SYS_DMBTH:
+        case SYS_DTMB:
                 return DVBV3_OFDM;
         case SYS_ATSC:
         case SYS_ATSCMH:
@@ -997,6 +997,7 @@ static struct dtv_cmds_h dtv_cmds[DTV_MAX_COMMAND + 1] = {
         _DTV_CMD(DTV_CODE_RATE_LP, 1, 0),
         _DTV_CMD(DTV_GUARD_INTERVAL, 1, 0),
         _DTV_CMD(DTV_TRANSMISSION_MODE, 1, 0),
+        _DTV_CMD(DTV_INTERLEAVING, 1, 0),
 
         _DTV_CMD(DTV_ISDBT_PARTIAL_RECEPTION, 1, 0),
         _DTV_CMD(DTV_ISDBT_SOUND_BROADCASTING, 1, 0),
@@ -1028,6 +1029,7 @@ static struct dtv_cmds_h dtv_cmds[DTV_MAX_COMMAND + 1] = {
         _DTV_CMD(DTV_GUARD_INTERVAL, 0, 0),
         _DTV_CMD(DTV_TRANSMISSION_MODE, 0, 0),
         _DTV_CMD(DTV_HIERARCHY, 0, 0),
+        _DTV_CMD(DTV_INTERLEAVING, 0, 0),
 
         _DTV_CMD(DTV_ENUM_DELSYS, 0, 0),
 
@@ -1326,6 +1328,9 @@ static int dtv_property_process_get(struct dvb_frontend *fe,
         case DTV_HIERARCHY:
                 tvp->u.data = c->hierarchy;
                 break;
+        case DTV_INTERLEAVING:
+                tvp->u.data = c->interleaving;
+                break;
 
         /* ISDB-T Support here */
         case DTV_ISDBT_PARTIAL_RECEPTION:
@@ -1593,7 +1598,7 @@ static int set_delivery_system(struct dvb_frontend *fe, u32 desired_system)
          * The DVBv3 or DVBv5 call is requesting a different system. So,
          * emulation is needed.
          *
-         * Emulate newer delivery systems like ISDBT, DVBT and DMBTH
+         * Emulate newer delivery systems like ISDBT, DVBT and DTMB
          * for older DVBv5 applications. The emulation will try to use
          * the auto mode for most things, and will assume that the desired
          * delivery system is the last one at the ops.delsys[] array
@@ -1715,6 +1720,9 @@ static int dtv_property_process_set(struct dvb_frontend *fe,
         case DTV_HIERARCHY:
                 c->hierarchy = tvp->u.data;
                 break;
+        case DTV_INTERLEAVING:
+                c->interleaving = tvp->u.data;
+                break;
 
         /* ISDB-T Support here */
         case DTV_ISDBT_PARTIAL_RECEPTION:
@@ -2012,7 +2020,7 @@ static int dtv_set_frontend(struct dvb_frontend *fe)
                 case SYS_DVBT:
                 case SYS_DVBT2:
                 case SYS_ISDBT:
-                case SYS_DMBTH:
+                case SYS_DTMB:
                         fepriv->min_delay = HZ / 20;
                         fepriv->step_size = fe->ops.info.frequency_stepsize * 2;
                         fepriv->max_drift = (fe->ops.info.frequency_stepsize * 2) + 1;
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h
index 7c64c09103a9..de410cc94fbb 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.h
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.h
@@ -354,6 +354,8 @@ struct dtv_frontend_properties {
 
         fe_delivery_system_t    delivery_system;
 
+        enum fe_interleaving    interleaving;
+
         /* ISDB-T specifics */
         u8                      isdbt_partial_reception;
         u8                      isdbt_sb_mode;
diff --git a/drivers/media/dvb/frontends/atbm8830.c b/drivers/media/dvb/frontends/atbm8830.c
index a2261ea2cf82..4e11dc4b1335 100644
--- a/drivers/media/dvb/frontends/atbm8830.c
+++ b/drivers/media/dvb/frontends/atbm8830.c
@@ -428,7 +428,7 @@ static int atbm8830_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
 }
 
 static struct dvb_frontend_ops atbm8830_ops = {
-        .delsys = { SYS_DMBTH },
+        .delsys = { SYS_DTMB },
         .info = {
                 .name = "AltoBeam ATBM8830/8831 DMB-TH",
                 .frequency_min = 474000000,
diff --git a/drivers/media/dvb/frontends/lgs8gl5.c b/drivers/media/dvb/frontends/lgs8gl5.c
index 2cec8041a106..416cce3fefc7 100644
--- a/drivers/media/dvb/frontends/lgs8gl5.c
+++ b/drivers/media/dvb/frontends/lgs8gl5.c
@@ -412,7 +412,7 @@ EXPORT_SYMBOL(lgs8gl5_attach);
 
 
 static struct dvb_frontend_ops lgs8gl5_ops = {
-        .delsys = { SYS_DMBTH },
+        .delsys = { SYS_DTMB },
         .info = {
                 .name                   = "Legend Silicon LGS-8GL5 DMB-TH",
                 .frequency_min          = 474000000,
diff --git a/drivers/media/dvb/frontends/lgs8gxx.c b/drivers/media/dvb/frontends/lgs8gxx.c
index c2ea2749ebed..3c92f36ea5c7 100644
--- a/drivers/media/dvb/frontends/lgs8gxx.c
+++ b/drivers/media/dvb/frontends/lgs8gxx.c
@@ -995,7 +995,7 @@ static int lgs8gxx_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
 }
 
 static struct dvb_frontend_ops lgs8gxx_ops = {
-        .delsys = { SYS_DMBTH },
+        .delsys = { SYS_DTMB },
         .info = {
                 .name = "Legend Silicon LGS8913/LGS8GXX DMB-TH",
                 .frequency_min = 474000000,