3.17-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Mauro Carvalho Chehab <m.che...@samsung.com>

commit 29bbb7bd0a65e01a0423e1df764676119b71ecb3 upstream.

Add support for PCTV microStick (77e) device that uses a sms1140
chipset.

Signed-off-by: Mauro Carvalho Chehab <m.che...@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 drivers/media/common/siano/sms-cards.c |    6 ++++++
 drivers/media/common/siano/sms-cards.h |    1 +
 drivers/media/usb/siano/smsusb.c       |    2 ++
 3 files changed, 9 insertions(+)

--- a/drivers/media/common/siano/sms-cards.c
+++ b/drivers/media/common/siano/sms-cards.c
@@ -157,6 +157,12 @@ static struct sms_board sms_boards[] = {
                .type = SMS_DENVER_2160,
                .default_mode = DEVICE_MODE_DAB_TDMB,
        },
+       [SMS1XXX_BOARD_PCTV_77E] = {
+               .name   = "Hauppauge microStick 77e",
+               .type   = SMS_NOVA_B0,
+               .fw[DEVICE_MODE_DVBT_BDA] = SMS_FW_DVB_NOVA_12MHZ_B0,
+               .default_mode = DEVICE_MODE_DVBT_BDA,
+       },
 };
 
 struct sms_board *sms_get_board(unsigned id)
--- a/drivers/media/common/siano/sms-cards.h
+++ b/drivers/media/common/siano/sms-cards.h
@@ -45,6 +45,7 @@
 #define SMS1XXX_BOARD_SIANO_RIO                18
 #define SMS1XXX_BOARD_SIANO_DENVER_1530        19
 #define SMS1XXX_BOARD_SIANO_DENVER_2160 20
+#define SMS1XXX_BOARD_PCTV_77E         21
 
 struct sms_board_gpio_cfg {
        int lna_vhf_exist;
--- a/drivers/media/usb/siano/smsusb.c
+++ b/drivers/media/usb/siano/smsusb.c
@@ -655,6 +655,8 @@ static const struct usb_device_id smsusb
                .driver_info = SMS1XXX_BOARD_ONDA_MDTV_DATA_CARD },
        { USB_DEVICE(0x3275, 0x0080),
                .driver_info = SMS1XXX_BOARD_SIANO_RIO },
+       { USB_DEVICE(0x2013, 0x0257),
+               .driver_info = SMS1XXX_BOARD_PCTV_77E },
        { } /* Terminating entry */
        };
 


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to