1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/media/video/cx231xx/cx231xx-avcore.c b/drivers/media/video/cx231xx/cx231xx-avcore.c
index c53e97295a0d..62843d39817c 100644
--- a/drivers/media/video/cx231xx/cx231xx-avcore.c
+++ b/drivers/media/video/cx231xx/cx231xx-avcore.c
@@ -759,11 +759,8 @@ int cx231xx_set_decoder_video_input(struct cx231xx *dev,
         case CX231XX_VMUX_TELEVISION:
         case CX231XX_VMUX_CABLE:
         default:
-                switch (dev->model) {
-                case CX231XX_BOARD_CNXT_CARRAERA:
-                case CX231XX_BOARD_CNXT_RDE_250:
-                case CX231XX_BOARD_CNXT_SHELBY:
-                case CX231XX_BOARD_CNXT_RDU_250:
+                /* TODO: Test if this is also needed for xc2028/xc3028 */
+                if (dev->board.tuner_type == TUNER_XC5000) {
                         /* Disable the use of  DIF   */
 
                         status = vid_blk_read_word(dev, AFE_CTRL, &value);
@@ -820,8 +817,7 @@ int cx231xx_set_decoder_video_input(struct cx231xx *dev,
                                 MODE_CTRL, FLD_INPUT_MODE,
                                 cx231xx_set_field(FLD_INPUT_MODE,
                                                 INPUT_MODE_CVBS_0));
-                        break;
-                default:
+                } else {
                         /* Enable the DIF for the tuner */
 
                         /* Reinitialize the DIF */
@@ -1275,6 +1271,8 @@ int cx231xx_enable_i2c_port_3(struct cx231xx *dev, bool is_port_3)
         int status = 0;
         bool current_is_port_3;
 
+        if (dev->board.dont_use_port_3)
+                is_port_3 = false;
         status = cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER,
                                        PWR_CTL_EN, value, 4);
         if (status < 0)
@@ -2550,7 +2548,7 @@ int cx231xx_initialize_stream_xfer(struct cx231xx *dev, u32 media_type)
                 case 4: /* ts1 */
                         cx231xx_info("%s: set ts1 registers", __func__);
 
-                if (dev->model == CX231XX_BOARD_CNXT_VIDEO_GRABBER) {
+                if (dev->board.has_417) {
                         cx231xx_info(" MPEG\n");
                         value &= 0xFFFFFFFC;
                         value |= 0x3;