From patchwork Sun May 9 23:15:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emard X-Patchwork-Id: 98033 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o49NFguX006294 for ; Sun, 9 May 2010 23:15:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752767Ab0EIXPl (ORCPT ); Sun, 9 May 2010 19:15:41 -0400 Received: from mail-ew0-f220.google.com ([209.85.219.220]:55337 "EHLO mail-ew0-f220.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752591Ab0EIXPk (ORCPT ); Sun, 9 May 2010 19:15:40 -0400 Received: by ewy20 with SMTP id 20so751084ewy.1 for ; Sun, 09 May 2010 16:15:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:received:date:from:to:cc :subject:message-id:references:mime-version:content-type :content-disposition:in-reply-to:user-agent; bh=G97PD3X76Ou3yg/NOll8erg63UJr9XsnjIpxB8QsmA0=; b=qosdu0eRk4BMqOHJu7Qx7PI1MPXAUAJFHF2ayCQKNLhYrtQ8vD2sJQOUj5exEc0PES 7vDIARqm5FH1oxms9ROKJs6Xfg+Uo4NIwuwhBko2yElbuxpvR/y4Z9aLQWG+adr+LxiN l3iw50wn5vsQfV+ldPFCxr7Hc6hNhFBnxZGtc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=bffcNXqbdEgXvEA1GndRJckcWSm2U6ouB4+BvQzm3rojVqzAHSKRtjfnYrmPW2giio rnE10gGeOJuhrIu8vDUhxMjFbclTZo8N0XVGvR0S/Z/f0Iz1NDFZfu5c3YZJdyrv8dDB sI7YqyPVBBG2IGyNC+Z5M1XHGaEFRlD5YukQY= Received: by 10.213.60.138 with SMTP id p10mr976587ebh.35.1273446938333; Sun, 09 May 2010 16:15:38 -0700 (PDT) Received: from z60m.lan (cpe-188-129-95-194.dynamic.amis.hr [188.129.95.194]) by mx.google.com with ESMTPS id 15sm2226767ewy.12.2010.05.09.16.15.37 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 09 May 2010 16:15:37 -0700 (PDT) Received: from emard by z60m.lan with local (Exim 4.71) (envelope-from ) id 1OBFih-0000MT-Ug; Mon, 10 May 2010 01:15:35 +0200 Date: Mon, 10 May 2010 01:15:35 +0200 From: Emard To: Samuel =?utf-8?Q?Rakitni=C4=8Dan?= Cc: Emard , "linux-media@vger.kernel.org" Subject: Re: [PATCH] Compro Videomate T750F Vista digital+analog support Message-ID: <20100509231535.GA6334@z60m> References: <20100508160628.GA6050@z60m> <20100509173243.GA8227@z60m> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) 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 (demeter.kernel.org [140.211.167.41]); Sun, 09 May 2010 23:15:43 +0000 (UTC) --- linux-2.6.33.3/drivers/media/video/saa7134/saa7134-cards.c.orig 2010-05-08 16:13:28.000000000 +0200 +++ linux-2.6.33.3/drivers/media/video/saa7134/saa7134-cards.c 2010-05-10 00:48:08.000000000 +0200 @@ -4881,12 +4881,14 @@ struct saa7134_board saa7134_boards[] = }, [SAA7134_BOARD_VIDEOMATE_T750] = { /* John Newbigin */ + /* Emard 2010-05-10 v17 */ .name = "Compro VideoMate T750", .audio_clock = 0x00187de7, .tuner_type = TUNER_XC2028, .radio_type = UNSET, - .tuner_addr = ADDR_UNSET, + .tuner_addr = 0x61, .radio_addr = ADDR_UNSET, + .mpeg = SAA7134_MPEG_DVB, .inputs = {{ .name = name_tv, .vmux = 3, @@ -6550,6 +6552,11 @@ static int saa7134_xc2028_callback(struc msleep(10); saa7134_set_gpio(dev, 18, 1); break; + case SAA7134_BOARD_VIDEOMATE_T750: + saa7134_set_gpio(dev, 20, 0); + msleep(10); + saa7134_set_gpio(dev, 20, 1); + break; } return 0; } @@ -6955,6 +6962,11 @@ int saa7134_board_init1(struct saa7134_d dev->has_remote = SAA7134_REMOTE_GPIO; saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, 0x00008000, 0x00008000); saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x00008000, 0x00008000); + break; + case SAA7134_BOARD_VIDEOMATE_T750: + dev->has_remote = SAA7134_REMOTE_GPIO; + saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, 0x00008000, 0x00008000); + saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x00008000, 0x00008000); break; } return 0; --- linux-2.6.33.3/drivers/media/video/saa7134/saa7134-dvb.c.orig 2010-05-08 16:20:12.000000000 +0200 +++ linux-2.6.33.3/drivers/media/video/saa7134/saa7134-dvb.c 2010-05-10 00:47:23.000000000 +0200 @@ -55,6 +55,7 @@ #include "tda8290.h" #include "zl10353.h" +#include "qt1010.h" #include "zl10036.h" #include "zl10039.h" @@ -886,6 +887,17 @@ static struct zl10353_config behold_x7_c .disable_i2c_gate_ctrl = 1, }; +static struct zl10353_config videomate_t750_zl10353_config = { + .demod_address = 0x0f, + .no_tuner = 1, + .parallel_ts = 1, +}; + +static struct qt1010_config videomate_t750_qt1010_config = { + .i2c_address = 0x62 +}; + + /* ================================================================== * tda10086 based DVB-S cards, helper functions */ @@ -1556,6 +1568,21 @@ static int dvb_init(struct saa7134_dev * __func__); break; + case SAA7134_BOARD_VIDEOMATE_T750: + printk("Compro VideoMate T750 DVB setup\n"); + fe0->dvb.frontend = dvb_attach(zl10353_attach, + &videomate_t750_zl10353_config, + &dev->i2c_adap); + if (fe0->dvb.frontend != NULL) { + // if there is a gate function then the i2c bus breaks.....! + fe0->dvb.frontend->ops.i2c_gate_ctrl = 0; + if (dvb_attach(qt1010_attach, + fe0->dvb.frontend, + &dev->i2c_adap, + &videomate_t750_qt1010_config) == NULL) + wprintk("error attaching QT1010\n"); + } + break; case SAA7134_BOARD_ZOLID_HYBRID_PCI: fe0->dvb.frontend = dvb_attach(tda10048_attach, &zolid_tda10048_config, --- linux-2.6.33.3/drivers/media/video/saa7134/saa7134-input.c.orig 2010-05-08 16:52:20.000000000 +0200 +++ linux-2.6.33.3/drivers/media/video/saa7134/saa7134-input.c 2010-05-09 17:32:25.000000000 +0200 @@ -671,6 +671,11 @@ int saa7134_input_init1(struct saa7134_d mask_keycode = 0x003f00; mask_keydown = 0x040000; break; + case SAA7134_BOARD_VIDEOMATE_T750: + ir_codes = &ir_codes_videomate_t750_table; + mask_keycode = 0x003f00; + mask_keyup = 0x040000; + break; case SAA7134_BOARD_LEADTEK_WINFAST_DTV1000S: ir_codes = &ir_codes_winfast_table; mask_keycode = 0x5f00; --- linux-2.6.33.3/drivers/media/IR/ir-keymaps.c.orig 2010-05-08 17:03:35.000000000 +0200 +++ linux-2.6.33.3/drivers/media/IR/ir-keymaps.c 2010-05-10 00:39:05.000000000 +0200 @@ -3197,6 +3197,96 @@ struct ir_scancode_table ir_codes_videom }; EXPORT_SYMBOL_GPL(ir_codes_videomate_s350_table); +/* +Compro videomate vista T750F remote +----------------------------------- +Emard 2010-05-09 + POWER +VIDEO RADIO AUDIO CAMERA +PVR EPG TV DVD SUBTITLE + + UP + LEFT OK RIGHT + DOWN + +BACK MENU INFO + +VOLUMEUP CHANNELUP + MUTE +VOLUMEDOWN CHANNELDOWN + +RECORD STOP +REWIND PLAY FASTFORWARD +PREVIOUSSONG PLAYPAUSE NEXTSONG + +NUMERIC_1 NUMERIC_2 NUMERIC_3 +NUMERIC_4 NUMERIC_5 NUMERIC_6 +NUMERIC_7 NUMERIC_8 NUMERIC_9 +NUMERIC_STAR NUMERIC_0 NUMERIC_POUND + +CLEAR ZOOM ENTER + +RED GREEN YELLOW BLUE TEXT +*/ +static struct ir_scancode ir_codes_videomate_t750[] = { + { 0x01, KEY_POWER}, + { 0x31, KEY_VIDEO}, + { 0x33, KEY_RADIO}, + { 0x2f, KEY_AUDIO}, + { 0x30, KEY_CAMERA}, /* pictures */ + { 0x2d, KEY_PVR}, /* Recordings */ + { 23, KEY_EPG}, + { 44, KEY_TV}, + { 43, KEY_DVD}, + { 0x32, KEY_SUBTITLE}, + { 17, KEY_UP}, + { 19, KEY_LEFT}, + { 21, KEY_OK}, + { 20, KEY_RIGHT}, + { 18, KEY_DOWN}, + { 22, KEY_BACK}, + { 0x02, KEY_MENU}, + { 0x04, KEY_INFO}, + { 0x05, KEY_VOLUMEUP}, + { 0x06, KEY_VOLUMEDOWN}, + { 0x03, KEY_MUTE}, + { 0x07, KEY_CHANNELUP}, + { 0x08, KEY_CHANNELDOWN}, + { 0x0c, KEY_RECORD}, + { 0x0e, KEY_STOP}, + { 0x0a, KEY_REWIND}, + { 0x0b, KEY_PLAY}, + { 0x09, KEY_FASTFORWARD}, + { 0x10, KEY_PREVIOUSSONG}, + { 0x0d, KEY_PLAYPAUSE}, + { 0x0f, KEY_NEXTSONG}, + { 30, KEY_NUMERIC_1}, + { 0x1f, KEY_NUMERIC_2}, + { 0x20, KEY_NUMERIC_3}, + { 0x21, KEY_NUMERIC_4}, + { 0x22, KEY_NUMERIC_5}, + { 0x23, KEY_NUMERIC_6}, + { 0x24, KEY_NUMERIC_7}, + { 0x25, KEY_NUMERIC_8}, + { 0x26, KEY_NUMERIC_9}, + { 0x2a, KEY_NUMERIC_STAR}, + { 29, KEY_NUMERIC_0}, + { 41, KEY_NUMERIC_POUND}, + { 39, KEY_CLEAR}, + { 0x34, KEY_ZOOM}, + { 0x28, KEY_ENTER}, + { 25, KEY_RED}, + { 26, KEY_GREEN}, + { 27, KEY_YELLOW}, + { 28, KEY_BLUE}, + { 24, KEY_TEXT}, +}; +struct ir_scancode_table ir_codes_videomate_t750_table = { + .scan = ir_codes_videomate_t750, + .size = ARRAY_SIZE(ir_codes_videomate_t750), +}; +EXPORT_SYMBOL_GPL(ir_codes_videomate_t750_table); + /* GADMEI UTV330+ RM008Z remote Shine Liu */ --- linux-2.6.33.3/include/media/ir-common.h.orig 2010-04-26 16:48:30.000000000 +0200 +++ linux-2.6.33.3/include/media/ir-common.h 2010-05-09 17:30:24.000000000 +0200 @@ -160,6 +160,7 @@ extern struct ir_scancode_table ir_codes extern struct ir_scancode_table ir_codes_evga_indtube_table; extern struct ir_scancode_table ir_codes_terratec_cinergy_xs_table; extern struct ir_scancode_table ir_codes_videomate_s350_table; +extern struct ir_scancode_table ir_codes_videomate_t750_table; extern struct ir_scancode_table ir_codes_gadmei_rm008z_table; extern struct ir_scancode_table ir_codes_nec_terratec_cinergy_xs_table; #endif