From patchwork Tue May 17 16:46:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Novgorodov X-Patchwork-Id: 791892 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 p4HGsQHu012660 for ; Tue, 17 May 2011 16:54:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755409Ab1EQQxx (ORCPT ); Tue, 17 May 2011 12:53:53 -0400 Received: from mail.bisel.ru ([80.93.56.210]:47906 "EHLO mail.bisel.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755317Ab1EQQxw (ORCPT ); Tue, 17 May 2011 12:53:52 -0400 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 17 May 2011 16:54:26 +0000 (UTC) X-Greylist: delayed 428 seconds by postgrey-1.27 at vger.kernel.org; Tue, 17 May 2011 12:53:52 EDT X-Envelope-Recipient: linux-media@vger.kernel.org X-DKIM: Sendmail DKIM Filter v2.8.3 mail.bisel.ru 36D0F47DB6D DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=novg.net; s=default; t=1305650799; bh=Lk/esePClbKvsuaUEmRTbP9MlKocOPHb6gEkMxz5D64=; l=2632; h=Message-ID:Date:From:Reply-To:MIME-Version:To:CC:Subject: Content-Type:Content-Transfer-Encoding; b=LYMBjZOPLVaLifUG+0AMo5jiXBQN4egOymtWShT4LWx+Llm5cbVdwk9s60JFf8GVk UN7vRdvvCQ8rgsvBnDU+EkCLKyZiDR5h1fc/oBYC/jTFIzIImuIKpXOn3uH7X0q4nY Ie8gVR+bV5eMx7S4lnKtBLKMuG2Fc4aq/S8Dr/zg= X-Envelope-Recipient: linux-kernel@vger.kernel.org Received: from [192.168.22.2] (a4k2.static.corbina.ru [93.81.251.34]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.bisel.ru (Postfix) with ESMTPSA id 36D0F47DB6D; Tue, 17 May 2011 20:46:38 +0400 (MSD) Message-ID: <4DD2A66C.3070006@novg.net> Date: Tue, 17 May 2011 20:46:36 +0400 From: Igor Novgorodov Reply-To: igor@novg.net Organization: Home User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.17) Gecko/20110414 Thunderbird/3.1.10 MIME-Version: 1.0 To: linux-media@vger.kernel.org CC: linux-kernel@vger.kernel.org Subject: [PATCH] cx231xx: Add support for Iconbit U100 X-Virus-Scanned: clamav-milter 0.97 at xenon X-Virus-Status: Clean Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Igor Novgorodov This patch adds support for the "Iconbit Analog Stick U100 FM". Only composite & s-video inputs, no tuner support now. Signed-off-by: Igor Novgorodov --- -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- linux-2.6.38.6.orig/drivers/media/video/cx231xx/cx231xx-cards.c 2011-05-10 02:16:23.000000000 +0400 +++ linux-2.6.38.6/drivers/media/video/cx231xx/cx231xx-cards.c 2011-05-17 12:03:11.410810992 +0400 @@ -435,7 +435,33 @@ struct cx231xx_board cx231xx_boards[] = .gpio = 0, } }, }, + + [CX231XX_BOARD_ICONBIT_U100] = { + .name = "Iconbit Analog Stick U100 FM", + .tuner_type = TUNER_ABSENT, + .decoder = CX231XX_AVDECODER, + .output_mode = OUT_MODE_VIP11, + .demod_xfer_mode = 0, + .ctl_pin_status_mask = 0xFFFFFFC4, + .agc_analog_digital_select_gpio = 0x1C, + .gpio_pin_status_mask = 0x4001000, + + .input = {{ + .type = CX231XX_VMUX_COMPOSITE1, + .vmux = CX231XX_VIN_2_1, + .amux = CX231XX_AMUX_LINE_IN, + .gpio = NULL, + }, { + .type = CX231XX_VMUX_SVIDEO, + .vmux = CX231XX_VIN_1_1 | + (CX231XX_VIN_1_2 << 8) | + CX25840_SVIDEO_ON, + .amux = CX231XX_AMUX_LINE_IN, + .gpio = NULL, + } }, + }, }; + const unsigned int cx231xx_bcount = ARRAY_SIZE(cx231xx_boards); /* table of devices that work with this driver */ @@ -464,6 +490,8 @@ struct usb_device_id cx231xx_id_table[] .driver_info = CX231XX_BOARD_HAUPPAUGE_USBLIVE2}, {USB_DEVICE_VER(USB_VID_PIXELVIEW, USB_PID_PIXELVIEW_SBTVD, 0x4000, 0x4001), .driver_info = CX231XX_BOARD_PV_PLAYTV_USB_HYBRID}, + {USB_DEVICE(0x1f4d, 0x0237), + .driver_info = CX231XX_BOARD_ICONBIT_U100}, {}, }; --- linux-2.6.38.6.orig/drivers/media/video/cx231xx/cx231xx.h 2011-05-10 02:16:23.000000000 +0400 +++ linux-2.6.38.6/drivers/media/video/cx231xx/cx231xx.h 2011-05-17 09:52:58.067471709 +0400 @@ -64,6 +64,7 @@ #define CX231XX_BOARD_HAUPPAUGE_EXETER 8 #define CX231XX_BOARD_HAUPPAUGE_USBLIVE2 9 #define CX231XX_BOARD_PV_PLAYTV_USB_HYBRID 10 +#define CX231XX_BOARD_ICONBIT_U100 11 /* Limits minimum and default number of buffers */ #define CX231XX_MIN_BUF 4