From patchwork Tue Jul 19 09:08:19 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: remi schwartz X-Patchwork-Id: 988442 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p6J98U53010241 for ; Tue, 19 Jul 2011 09:08:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752677Ab1GSJI2 (ORCPT ); Tue, 19 Jul 2011 05:08:28 -0400 Received: from mail-fx0-f52.google.com ([209.85.161.52]:43778 "EHLO mail-fx0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752456Ab1GSJI0 (ORCPT ); Tue, 19 Jul 2011 05:08:26 -0400 Received: by fxd18 with SMTP id 18so8155842fxd.11 for ; Tue, 19 Jul 2011 02:08:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:references:in-reply-to :mime-version:content-type:message-id; bh=ImjNZ89X5Y7inBsVU0kLJT9i+c/D5lSDWFnvEEfWIq4=; b=HyLAEWgXz/tKDG4LuuHxW7r2LqtQ92wynv6Ab/1b7cKm6L5lVspYodw+XpvCCsGDwL pvrUjWu3nWT3lcQsab1m81O6JEo9ddwAi0Oan8sVbzR1yxrCl+7XLVpi9m5+KmdKPuZ0 KqrSwxDasdK+azddBiHM1C7+0kWYUR7V8eMN0= Received: by 10.204.172.2 with SMTP id j2mr2088757bkz.397.1311066504548; Tue, 19 Jul 2011 02:08:24 -0700 (PDT) Received: from fixe.maison (boi59-3-82-233-182-25.fbx.proxad.net [82.233.182.25]) by mx.google.com with ESMTPS id q1sm3099579faa.1.2011.07.19.02.08.21 (version=SSLv3 cipher=OTHER); Tue, 19 Jul 2011 02:08:22 -0700 (PDT) From: remi schwartz To: Mauro Carvalho Chehab Subject: Re: patch for Asus My Cinema PS3-100 (1043:48cd) Date: Tue, 19 Jul 2011 11:08:19 +0200 User-Agent: KMail/1.13.5 (Linux/2.6.32-5-amd64; KDE/4.4.5; x86_64; ; ) Cc: linux-media@vger.kernel.org References: <201107141128.23344.remzouille@free.fr> <4E1F1E5F.2040302@redhat.com> <201107151918.24938.remzouille@free.fr> In-Reply-To: <201107151918.24938.remzouille@free.fr> MIME-Version: 1.0 Message-Id: <201107191108.19855.remi.schwartz@gmail.com> 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.6 (demeter2.kernel.org [140.211.167.43]); Tue, 19 Jul 2011 09:08:30 +0000 (UTC) Le vendredi 15 juillet 2011, remzouille a écrit : > Le jeudi 14 juillet 2011 18:50:39, vous avez écrit : > > Em 14-07-2011 06:28, remzouille escreveu: > > > Hi all, > > > > > > This is the patch against kernel 2.6.32 I used to get to work my TV > > > card Asus My Cinema PS3-100 (1043:48cd). > > > > > > More information on this card can be found on this page : > > > > > > http://techblog.hollants.com/2009/09/asus-mycinema-ps3-100-3-in-1-tv-ca > > > rd / > > > > > > This card seems to be a clone of the Asus Tiger 3in1, numbered 147 in > > > the SAA7134 module, so I gave it the temporary number of 1470. > > > > > > It has in addition a remote controller that works fine with the > > > ir_codes_asus_pc39_table. I haven't finished the work on all keys but > > > the most usefull ones are working. > > > > Please finish the keytable mapping and re-send it with your > > Signed-off-By. > > Ok, I'll do that when I am back at home in a few days. > As I said, the remote is already quite fully functional. > The remote part is now complete. > > > DVB-T and remote have been tested and work fine. > > > DVB-S, FM and Composite input haven't been tested. > > > > > > Hope that will help some of you. > > > > Thanks! > > Mauro > > You're welcome ! > > Rémi Signed-off-by: Remzouille --- ./include/media/ir-common.h.orig 2009-12-03 04:51:21.000000000 +0100 +++ ./include/media/ir-common.h 2011-07-18 23:53:17.281797898 +0200 @@ -155,6 +155,7 @@ extern struct ir_scancode_table ir_codes extern struct ir_scancode_table ir_codes_proteus_2309_table; extern struct ir_scancode_table ir_codes_budget_ci_old_table; extern struct ir_scancode_table ir_codes_asus_pc39_table; +extern struct ir_scancode_table ir_codes_asus_ps3_100_table; extern struct ir_scancode_table ir_codes_encore_enltv_table; extern struct ir_scancode_table ir_codes_encore_enltv2_table; extern struct ir_scancode_table ir_codes_tt_1500_table; --- ./drivers/media/common/ir-keymaps.c.orig 2009-12-03 04:51:21.000000000 +0100 +++ ./drivers/media/common/ir-keymaps.c 2011-07-19 00:10:56.090801168 +0200 @@ -2064,6 +2064,70 @@ struct ir_scancode_table ir_codes_asus_p EXPORT_SYMBOL_GPL(ir_codes_asus_pc39_table); +/* + * Remzouille + * this is the remote control that comes with the asus my cinema ps3-100 + * base taken from pc39 one + */ +static struct ir_scancode ir_codes_asus_ps3_100[] = { + { 0x23, KEY_HOME }, /* home */ + { 0x21, KEY_TV }, /* tv */ + { 0x3c, KEY_TEXT }, /* teletext */ + { 0x16, KEY_POWER }, /* close */ + + { 0x34, KEY_RED }, /* red */ + { 0x32, KEY_YELLOW }, /* yellow */ + { 0x39, KEY_BLUE }, /* blue */ + { 0x38, KEY_GREEN }, /* green */ + + /* Keys 0 to 9 */ + { 0x15, KEY_0 }, + { 0x29, KEY_1 }, + { 0x2d, KEY_2 }, + { 0x2b, KEY_3 }, + { 0x09, KEY_4 }, + { 0x0d, KEY_5 }, + { 0x0b, KEY_6 }, + { 0x31, KEY_7 }, + { 0x35, KEY_8 }, + { 0x33, KEY_9 }, + + { 0x2a, KEY_VOLUMEUP }, + { 0x19, KEY_VOLUMEDOWN }, + { 0x0a, KEY_CHANNELUP }, /* channel / program + */ + { 0x1b, KEY_CHANNELDOWN }, /* channel / program - */ + + { 0x37, KEY_UP }, + { 0x3b, KEY_DOWN }, + { 0x27, KEY_LEFT }, + { 0x2f, KEY_RIGHT }, + { 0x1a, KEY_ENTER }, /* enter */ + + { 0x1d, KEY_EXIT }, /* back */ + { 0x13, KEY_AB }, /* recall */ + + { 0x1f, KEY_AUDIO }, /* TV audio */ + { 0x08, KEY_SCREEN }, /* snapshot */ + { 0x11, KEY_ZOOM }, /* full screen */ + { 0x3d, KEY_MUTE }, /* mute */ + + { 0x0e, KEY_REWIND }, /* backward << */ + { 0x2e, KEY_RECORD }, /* recording */ + { 0x36, KEY_STOP }, + { 0x3a, KEY_FASTFORWARD }, /* forward >> */ + { 0x1e, KEY_PREVIOUS }, /* rew */ + { 0x25, KEY_PAUSE }, /* pause */ + { 0x06, KEY_PLAY }, /* play */ + { 0x26, KEY_NEXT }, /* forward */ +}; + +struct ir_scancode_table ir_codes_asus_ps3_100_table = { + .scan = ir_codes_asus_ps3_100, + .size = ARRAY_SIZE(ir_codes_asus_ps3_100), +}; +EXPORT_SYMBOL_GPL(ir_codes_asus_ps3_100_table); + + /* Encore ENLTV-FM - black plastic, white front cover with white glowing buttons Juan Pablo Sormani */ static struct ir_scancode ir_codes_encore_enltv[] = { --- ./drivers/media/video/saa7134/saa7134-input.c.orig 2009-12-03 04:51:21.000000000 +0100 +++ ./drivers/media/video/saa7134/saa7134-input.c 2011-07-18 23:53:17.293797824 +0200 @@ -575,6 +575,11 @@ int saa7134_input_init1(struct saa7134_d mask_keydown = 0x0040000; rc5_gpio = 1; break; + case SAA7134_BOARD_ASUSTeK_PS3_100: + ir_codes = &ir_codes_asus_ps3_100_table; + mask_keydown = 0x0040000; + rc5_gpio = 1; + break; case SAA7134_BOARD_ENCORE_ENLTV: case SAA7134_BOARD_ENCORE_ENLTV_FM: ir_codes = &ir_codes_encore_enltv_table; --- ./drivers/media/video/saa7134/saa7134-dvb.c.orig 2011-06-11 21:08:41.000000000 +0200 +++ ./drivers/media/video/saa7134/saa7134-dvb.c 2011-07-18 23:53:17.293797824 +0200 @@ -824,6 +824,20 @@ static struct tda1004x_config asus_tiger .request_firmware = philips_tda1004x_request_firmware }; +static struct tda1004x_config asus_ps3_100_config = { + .demod_address = 0x0b, + .invert = 1, + .invert_oclk = 0, + .xtal_freq = TDA10046_XTAL_16M, + .agc_config = TDA10046_AGC_TDA827X, + .gpio_config = TDA10046_GP11_I, + .if_freq = TDA10046_FREQ_045, + .i2c_gate = 0x4b, + .tuner_address = 0x61, + .antenna_switch = 1, + .request_firmware = philips_tda1004x_request_firmware +}; + /* ------------------------------------------------------------------ * special case: this card uses saa713x GPIO22 for the mode switch */ @@ -1465,6 +1479,31 @@ static int dvb_init(struct saa7134_dev * " found!\n", __func__); goto dettach_frontend; } + } + } + break; + case SAA7134_BOARD_ASUSTeK_PS3_100: + if (!use_frontend) { /* terrestrial */ + if (configure_tda827x_fe(dev, &asus_ps3_100_config, + &tda827x_cfg_2) < 0) + goto dettach_frontend; + } else { /* satellite */ + fe0->dvb.frontend = dvb_attach(tda10086_attach, + &flydvbs, &dev->i2c_adap); + if (fe0->dvb.frontend) { + if (dvb_attach(tda826x_attach, + fe0->dvb.frontend, 0x60, + &dev->i2c_adap, 0) == NULL) { + wprintk("%s: Asus My Cinema PS3-100, no " + "tda826x found!\n", __func__); + goto dettach_frontend; + } + if (dvb_attach(lnbp21_attach, fe0->dvb.frontend, + &dev->i2c_adap, 0, 0) == NULL) { + wprintk("%s: Asus My Cinema PS3-100, no lnbp21" + " found!\n", __func__); + goto dettach_frontend; + } } } break; --- ./drivers/media/video/saa7134/saa7134-cards.c.orig 2011-06-11 21:08:41.000000000 +0200 +++ ./drivers/media/video/saa7134/saa7134-cards.c 2011-07-19 10:54:04.549428209 +0200 @@ -5012,6 +5012,36 @@ struct saa7134_board saa7134_boards[] = .gpio = 0x0200000, }, }, + [SAA7134_BOARD_ASUSTeK_PS3_100] = { + .name = "Asus My Cinema PS3-100", + .audio_clock = 0x00187de7, + .tuner_type = TUNER_PHILIPS_TDA8290, + .radio_type = UNSET, + .tuner_addr = ADDR_UNSET, + .radio_addr = ADDR_UNSET, + .tuner_config = 2, + .gpiomask = 1 << 21, + .mpeg = SAA7134_MPEG_DVB, + .inputs = {{ + .name = name_tv, + .vmux = 1, + .amux = TV, + .tv = 1, + }, { + .name = name_comp, + .vmux = 0, + .amux = LINE2, + }, { + .name = name_svideo, + .vmux = 8, + .amux = LINE2, + } }, + .radio = { + .name = name_radio, + .amux = TV, + .gpio = 0x0200000, + }, + }, [SAA7134_BOARD_REAL_ANGEL_220] = { .name = "Zogis Real Angel 220", .audio_clock = 0x00187de7, @@ -6407,6 +6437,12 @@ struct pci_device_id saa7134_pci_tbl[] = .driver_data = SAA7134_BOARD_ASUSTeK_TIGER_3IN1, }, { .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, + .subvendor = 0x1043, + .subdevice = 0x48cd, + .driver_data = SAA7134_BOARD_ASUSTeK_PS3_100, + }, { + .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7134, .subvendor = 0x17de, .subdevice = 0x7128, @@ -6753,6 +6789,7 @@ int saa7134_board_init1(struct saa7134_d case SAA7134_BOARD_ASUSTeK_P7131_DUAL: case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA: case SAA7134_BOARD_ASUSTeK_P7131_ANALOG: + case SAA7134_BOARD_ASUSTeK_PS3_100: case SAA7134_BOARD_FLYDVBTDUO: case SAA7134_BOARD_PROTEUS_2309: case SAA7134_BOARD_AVERMEDIA_A16AR: @@ -7181,6 +7218,14 @@ int saa7134_board_init2(struct saa7134_d { u8 data[] = { 0x3c, 0x33, 0x60}; struct i2c_msg msg = {.addr = 0x0b, .flags = 0, .buf = data, + .len = sizeof(data)}; + i2c_transfer(&dev->i2c_adap, &msg, 1); + break; + } + case SAA7134_BOARD_ASUSTeK_PS3_100: + { + u8 data[] = { 0x3c, 0x33, 0x60}; + struct i2c_msg msg = {.addr = 0x0b, .flags = 0, .buf = data, .len = sizeof(data)}; i2c_transfer(&dev->i2c_adap, &msg, 1); break; --- ./drivers/media/video/saa7134/saa7134.h.orig 2011-06-11 21:08:41.000000000 +0200 +++ ./drivers/media/video/saa7134/saa7134.h 2011-07-18 23:53:17.297799213 +0200 @@ -271,6 +271,7 @@ struct saa7134_format { #define SAA7134_BOARD_AVERMEDIA_M103 145 #define SAA7134_BOARD_ASUSTeK_P7131_ANALOG 146 #define SAA7134_BOARD_ASUSTeK_TIGER_3IN1 147 +#define SAA7134_BOARD_ASUSTeK_PS3_100 1470 #define SAA7134_BOARD_ENCORE_ENLTV_FM53 148 #define SAA7134_BOARD_AVERMEDIA_M135A 149 #define SAA7134_BOARD_REAL_ANGEL_220 150