summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <m.chehab@samsung.com>2014-03-05 00:49:07 +0100
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-03-11 10:56:45 +0100
commit88e4fcda55e07278fcf5f6eea684685ffc0633e2 (patch)
tree1762aad137f8015c31242bf1b01e730aaffb6709 /drivers/media/usb
parent[media] vivi: fix ENUM_FRAMEINTERVALS implementation (diff)
downloadlinux-88e4fcda55e07278fcf5f6eea684685ffc0633e2.tar.xz
linux-88e4fcda55e07278fcf5f6eea684685ffc0633e2.zip
[media] em28xx: only enable PCTV 80e led when streaming
Instead of keeping the led always on, use it to indicate when DVB is streaming. Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/usb')
-rw-r--r--drivers/media/usb/em28xx/em28xx-cards.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index 66d9c8798c82..2fb300e882f0 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -228,8 +228,8 @@ static struct em28xx_reg_seq terratec_cinergy_USB_XS_FR_digital[] = {
7: LED on, active high */
static struct em28xx_reg_seq em2874_pctv_80e_digital[] = {
{EM28XX_R06_I2C_CLK, 0x45, 0xff, 10}, /*400 KHz*/
- {EM2874_R80_GPIO_P0_CTRL, 0x80, 0xff, 100},/*Demod reset*/
- {EM2874_R80_GPIO_P0_CTRL, 0xc0, 0xff, 10},
+ {EM2874_R80_GPIO_P0_CTRL, 0x00, 0xff, 100},/*Demod reset*/
+ {EM2874_R80_GPIO_P0_CTRL, 0x40, 0xff, 10},
{ -1, -1, -1, -1},
};
@@ -526,6 +526,16 @@ static struct em28xx_led kworld_ub435q_v3_leds[] = {
{-1, 0, 0, 0},
};
+static struct em28xx_led pctv_80e_leds[] = {
+ {
+ .role = EM28XX_LED_DIGITAL_CAPTURING,
+ .gpio_reg = EM2874_R80_GPIO_P0_CTRL,
+ .gpio_mask = 0x80,
+ .inverted = 0,
+ },
+ {-1, 0, 0, 0},
+};
+
/*
* Board definitions
@@ -2179,6 +2189,7 @@ struct em28xx_board em28xx_boards[] = {
.dvb_gpio = em2874_pctv_80e_digital,
.decoder = EM28XX_NODECODER,
.ir_codes = RC_MAP_PINNACLE_PCTV_HD,
+ .leds = pctv_80e_leds,
},
/* 1ae7:9003/9004 SpeedLink Vicious And Devine Laplace webcam
* Empia EM2765 + OmniVision OV2640 */