From patchwork Mon Nov 8 15:59:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 308712 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 oA8FxG3I023647 for ; Mon, 8 Nov 2010 15:59:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753411Ab0KHP7N (ORCPT ); Mon, 8 Nov 2010 10:59:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56832 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753022Ab0KHP7M (ORCPT ); Mon, 8 Nov 2010 10:59:12 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oA8FxBRJ024358 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 8 Nov 2010 10:59:11 -0500 Received: from [10.3.229.31] (vpn-229-31.phx2.redhat.com [10.3.229.31]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oA8Fx9NN029338; Mon, 8 Nov 2010 10:59:10 -0500 Message-ID: <4CD81E4C.8000106@redhat.com> Date: Mon, 08 Nov 2010 13:59:08 -0200 From: Mauro Carvalho Chehab User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.9) Gecko/20100827 Red Hat/3.1.3-1.el6 Lightning/1.0b2 Thunderbird/3.1.3 MIME-Version: 1.0 To: =?ISO-8859-1?Q?M=E1rcio_Ara=FAjo_Alves?= , Linux Media Mailing List Subject: [RFC PATCH] cx231xx: Add support for Kworld UB430 AF X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 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]); Mon, 08 Nov 2010 15:59:16 +0000 (UTC) --- patchwork.orig/drivers/media/video/cx231xx/cx231xx-cards.c +++ patchwork/drivers/media/video/cx231xx/cx231xx-cards.c @@ -435,6 +435,52 @@ struct cx231xx_board cx231xx_boards[] = .gpio = 0, } }, }, + [CX231XX_BOARD_KWORLD_U430_AF] = { + .name = "Kworld UB430-AF", + .tuner_type = TUNER_NXP_TDA18271, + .tuner_addr = 0x60, + .decoder = CX231XX_AVDECODER, + .output_mode = OUT_MODE_VIP11, + .demod_xfer_mode = 0, + .ctl_pin_status_mask = 0xFFFFFFC4, + .agc_analog_digital_select_gpio = 0xffff, + .tuner_sif_gpio = -1, + .tuner_scl_gpio = -1, + .tuner_sda_gpio = -1, + .gpio_pin_status_mask = 0x4001000, + .tuner_i2c_master = 2, + .demod_i2c_master = 1, +#if 0 + /* + * FIXME: it is very likely that this device uses an I2C + * remote controller. Not sure if it will use the same + * i2c addr as Pixelview, or what's the keycode map. + */ + .ir_i2c_master = 2, + .rc_map = RC_MAP_KWORLD_315U, +#endif + .has_dvb = 1, + .demod_addr = 0x10, + .norm = V4L2_STD_PAL_M, + .input = {{ + .type = CX231XX_VMUX_TELEVISION, + .vmux = CX231XX_VIN_3_1, + .amux = CX231XX_AMUX_VIDEO, + .gpio = 0, + }, { + .type = CX231XX_VMUX_COMPOSITE1, + .vmux = CX231XX_VIN_2_1, + .amux = CX231XX_AMUX_LINE_IN, + .gpio = 0, + }, { + .type = CX231XX_VMUX_SVIDEO, + .vmux = CX231XX_VIN_1_1 | + (CX231XX_VIN_1_2 << 8) | + CX25840_SVIDEO_ON, + .amux = CX231XX_AMUX_LINE_IN, + .gpio = 0, + } }, + }, }; const unsigned int cx231xx_bcount = ARRAY_SIZE(cx231xx_boards); @@ -464,6 +510,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(USB_VID_KWORLD_2, USB_PID_KWORLD_UB430_AF), + .driver_info = CX231XX_BOARD_KWORLD_U430_AF}, {}, }; --- patchwork.orig/drivers/media/dvb/dvb-usb/dvb-usb-ids.h +++ patchwork/drivers/media/dvb/dvb-usb/dvb-usb-ids.h @@ -130,6 +130,7 @@ #define USB_PID_KWORLD_PC160_2T 0xc160 #define USB_PID_KWORLD_PC160_T 0xc161 #define USB_PID_KWORLD_UB383_T 0xe383 +#define USB_PID_KWORLD_UB430_AF 0xe424 #define USB_PID_KWORLD_VSTREAM_COLD 0x17de #define USB_PID_KWORLD_VSTREAM_WARM 0x17df #define USB_PID_TERRATEC_CINERGY_T_USB_XE 0x0055