releases/4.8.5/cx231xx-fix-gpios-for-pixelview-sbtvd-hybrid.patch

   1 From 24b923f073ac37eb744f56a2c7f77107b8219ab2 Mon Sep 17 00:00:00 2001
   2 From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
   3 Date: Sun, 4 Sep 2016 10:06:39 -0300
   4 Subject: [media] cx231xx: fix GPIOs for Pixelview SBTVD hybrid
   5
   6 From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
   7
   8 commit 24b923f073ac37eb744f56a2c7f77107b8219ab2 upstream.
   9
  10 This device uses GPIOs: 28 to switch between analog and
  11 digital modes: on digital mode, it should be set to 1.
  12
  13 The code that sets it on analog mode is OK, but it misses
  14 the logic that sets it on digital mode.
  15
  16 Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
  17 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  18
  19 ---
  20  drivers/media/usb/cx231xx/cx231xx-cards.c |    2 +-
  21  drivers/media/usb/cx231xx/cx231xx-core.c  |    3 ++-
  22  2 files changed, 3 insertions(+), 2 deletions(-)
  23
  24 --- a/drivers/media/usb/cx231xx/cx231xx-cards.c
  25 +++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
  26 @@ -486,7 +486,7 @@ struct cx231xx_board cx231xx_boards[] =
  27                 .output_mode = OUT_MODE_VIP11,
  28                 .demod_xfer_mode = 0,
  29                 .ctl_pin_status_mask = 0xFFFFFFC4,
  30 -               .agc_analog_digital_select_gpio = 0x00, /* According with PV cxPolaris.inf file */
  31 +               .agc_analog_digital_select_gpio = 0x1c,
  32                 .tuner_sif_gpio = -1,
  33                 .tuner_scl_gpio = -1,
  34                 .tuner_sda_gpio = -1,
  35 --- a/drivers/media/usb/cx231xx/cx231xx-core.c
  36 +++ b/drivers/media/usb/cx231xx/cx231xx-core.c
  37 @@ -712,6 +712,7 @@ int cx231xx_set_mode(struct cx231xx *dev
  38                         break;
  39                 case CX231XX_BOARD_CNXT_RDE_253S:
  40                 case CX231XX_BOARD_CNXT_RDU_253S:
  41 +               case CX231XX_BOARD_PV_PLAYTV_USB_HYBRID:
  42                         errCode = cx231xx_set_agc_analog_digital_mux_select(dev, 1);
  43                         break;
  44                 case CX231XX_BOARD_HAUPPAUGE_EXETER:
  45 @@ -738,7 +739,7 @@ int cx231xx_set_mode(struct cx231xx *dev
  46                 case CX231XX_BOARD_PV_PLAYTV_USB_HYBRID:
  47                 case CX231XX_BOARD_HAUPPAUGE_USB2_FM_PAL:
  48                 case CX231XX_BOARD_HAUPPAUGE_USB2_FM_NTSC:
  49 -               errCode = cx231xx_set_agc_analog_digital_mux_select(dev, 0);
  50 +                       errCode = cx231xx_set_agc_analog_digital_mux_select(dev, 0);
  51                         break;
  52                 default:
  53                         break;