From patchwork Wed Jan 5 17:58:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Holger Nelson X-Patchwork-Id: 454421 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p05HwcHf028291 for ; Wed, 5 Jan 2011 17:58:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751608Ab1AER6h (ORCPT ); Wed, 5 Jan 2011 12:58:37 -0500 Received: from mail.hnelson.de ([87.230.84.188]:32882 "EHLO mail.hnelson.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751211Ab1AER6g (ORCPT ); Wed, 5 Jan 2011 12:58:36 -0500 Received: from nova.crius.de (77-23-222-80-dynip.superkabel.de [77.23.222.80]) by mail.hnelson.de (Postfix) with ESMTPSA id EB8663340002; Wed, 5 Jan 2011 18:58:34 +0100 (CET) Date: Wed, 5 Jan 2011 18:58:34 +0100 (CET) From: Holger Nelson X-X-Sender: crius@nova.crius.de To: Stefan Ringel cc: Linux Media Mailing List Subject: Re: Add Terratec Grabster support to tm6000 Message-ID: User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 05 Jan 2011 17:58:38 +0000 (UTC) diff --git a/drivers/staging/tm6000/tm6000-cards.c b/drivers/staging/tm6000/tm6000-cards.c index 5a7946c..0f4154f 100644 --- a/drivers/staging/tm6000/tm6000-cards.c +++ b/drivers/staging/tm6000/tm6000-cards.c @@ -50,6 +50,7 @@ #define TM6010_BOARD_BEHOLD_VOYAGER 11 #define TM6010_BOARD_TERRATEC_CINERGY_HYBRID_XE 12 #define TM6010_BOARD_TWINHAN_TU501 13 +#define TM5600_BOARD_TERRATEC_GRABSTER 14 #define TM6000_MAXBOARDS 16 static unsigned int card[] = {[0 ... (TM6000_MAXBOARDS - 1)] = UNSET }; @@ -303,6 +304,19 @@ struct tm6000_board tm6000_boards[] = { .dvb_led = TM6010_GPIO_5, .ir = TM6010_GPIO_0, }, + }, + [TM5600_BOARD_TERRATEC_GRABSTER] = { + .name = "Terratec Grabster AV 150/250 MX", + .type = TM5600, + .caps = { + .has_tuner = 0, + .has_dvb = 0, + .has_zl10353 = 0, + .has_eeprom = 0, + .has_remote = 0, + }, + .gpio = { + }, } }; @@ -325,6 +339,7 @@ struct usb_device_id tm6000_id_table[] = { { USB_DEVICE(0x13d3, 0x3241), .driver_info = TM6010_BOARD_TWINHAN_TU501 }, { USB_DEVICE(0x13d3, 0x3243), .driver_info = TM6010_BOARD_TWINHAN_TU501 }, { USB_DEVICE(0x13d3, 0x3264), .driver_info = TM6010_BOARD_TWINHAN_TU501 }, + { USB_DEVICE(0x0ccd, 0x0079), .driver_info = TM5600_BOARD_TERRATEC_GRABSTER }, { }, }; @@ -447,6 +462,8 @@ int tm6000_cards_setup(struct tm6000_core *dev) * the board-specific session. */ switch (dev->model) { + case TM5600_BOARD_TERRATEC_GRABSTER: + return 0; case TM6010_BOARD_HAUPPAUGE_900H: case TM6010_BOARD_TERRATEC_CINERGY_HYBRID_XE: case TM6010_BOARD_TWINHAN_TU501: