1 files changed, 20 insertions, 4 deletions

diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 4e6ee5584cb3..27222c92b603 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -970,7 +970,8 @@ static const struct cx88_board cx88_boards[] = {
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
-                .audio_chip = V4L2_IDENT_WM8775,
+                .audio_chip     = V4L2_IDENT_WM8775,
+                .i2sinputcntl   = 2,
                 .input          = {{
                         .type   = CX88_VMUX_DVB,
                         .vmux   = 0,
@@ -1952,6 +1953,18 @@ static const struct cx88_board cx88_boards[] = {
                 } },
                 .mpeg           = CX88_MPEG_DVB,
         },
+        [CX88_BOARD_TEVII_S464] = {
+                .name           = "TeVii S464 DVB-S/S2",
+                .tuner_type     = UNSET,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .input          = {{
+                        .type   = CX88_VMUX_DVB,
+                        .vmux   = 0,
+                } },
+                .mpeg           = CX88_MPEG_DVB,
+        },
         [CX88_BOARD_OMICOM_SS4_PCI] = {
                 .name           = "Omicom SS4 DVB-S/S2 PCI",
                 .tuner_type     = UNSET,
@@ -2528,6 +2541,10 @@ static const struct cx88_subid cx88_subids[] = {
                 .subdevice = 0x9022,
                 .card      = CX88_BOARD_TEVII_S460,
         }, {
+                .subvendor = 0xd464,
+                .subdevice = 0x9022,
+                .card      = CX88_BOARD_TEVII_S464,
+        }, {
                 .subvendor = 0xA044,
                 .subdevice = 0x2011,
                 .card      = CX88_BOARD_OMICOM_SS4_PCI,
@@ -3165,9 +3182,7 @@ static void cx88_card_setup(struct cx88_core *core)
 {
         static u8 eeprom[256];
         struct tuner_setup tun_setup;
-        unsigned int mode_mask = T_RADIO     |
-                                 T_ANALOG_TV |
-                                 T_DIGITAL_TV;
+        unsigned int mode_mask = T_RADIO | T_ANALOG_TV;
 
         memset(&tun_setup, 0, sizeof(tun_setup));
 
@@ -3287,6 +3302,7 @@ static void cx88_card_setup(struct cx88_core *core)
         }
         case  CX88_BOARD_TEVII_S420:
         case  CX88_BOARD_TEVII_S460:
+        case  CX88_BOARD_TEVII_S464:
         case  CX88_BOARD_OMICOM_SS4_PCI:
         case  CX88_BOARD_TBS_8910:
         case  CX88_BOARD_TBS_8920: