3 files changed, 14 insertions, 1 deletions

diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 3c9482660eac..ddf639ed2fd8 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -1031,6 +1031,8 @@ static struct dtv_cmds_h dtv_cmds[] = {
         _DTV_CMD(DTV_ISDBT_LAYERC_SEGMENT_COUNT, 0, 0),
         _DTV_CMD(DTV_ISDBT_LAYERC_TIME_INTERLEAVING, 0, 0),
 
+        _DTV_CMD(DTV_ISDBS_TS_ID, 1, 0),
+
         /* Get */
         [DTV_DISEQC_SLAVE_REPLY] = {
                 .name   = "DTV_DISEQC_SLAVE_REPLY",
@@ -1420,6 +1422,9 @@ static int dtv_property_process_get(struct dvb_frontend *fe,
         case DTV_ISDBT_LAYERC_TIME_INTERLEAVING:
                 tvp->u.data = fe->dtv_property_cache.layer[2].interleaving;
                 break;
+        case DTV_ISDBS_TS_ID:
+                tvp->u.data = fe->dtv_property_cache.isdbs_ts_id;
+                break;
         default:
                 r = -1;
         }
@@ -1571,6 +1576,9 @@ static int dtv_property_process_set(struct dvb_frontend *fe,
         case DTV_ISDBT_LAYERC_TIME_INTERLEAVING:
                 fe->dtv_property_cache.layer[2].interleaving = tvp->u.data;
                 break;
+        case DTV_ISDBS_TS_ID:
+                fe->dtv_property_cache.isdbs_ts_id = tvp->u.data;
+                break;
         default:
                 r = -1;
         }
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h
index 9e46f1772c54..810f07d63246 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.h
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.h
@@ -355,6 +355,9 @@ struct dtv_frontend_properties {
             fe_modulation_t     modulation;
             u8                  interleaving;
         } layer[3];
+
+        /* ISDB-T specifics */
+        u32                     isdbs_ts_id;
 };
 
 struct dvb_frontend {
diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h
index 25b01c14727b..b6cb5425cde3 100644
--- a/include/linux/dvb/frontend.h
+++ b/include/linux/dvb/frontend.h
@@ -302,7 +302,9 @@ struct dvb_frontend_event {
 
 #define DTV_ISDBT_LAYER_ENABLED 41
 
-#define DTV_MAX_COMMAND                         DTV_ISDBT_LAYER_ENABLED
+#define DTV_ISDBS_TS_ID         42
+
+#define DTV_MAX_COMMAND                         DTV_ISDBS_TS_ID
 
 typedef enum fe_pilot {
         PILOT_ON,