From patchwork Thu Nov 5 14:55:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?THVrw4PCocOFwqEgS2FyYXM=?= X-Patchwork-Id: 57899 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nA5EuE3U016843 for ; Thu, 5 Nov 2009 14:56:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758030AbZKEO4F (ORCPT ); Thu, 5 Nov 2009 09:56:05 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757991AbZKEO4F (ORCPT ); Thu, 5 Nov 2009 09:56:05 -0500 Received: from service2.sh.cvut.cz ([147.32.127.218]:47331 "EHLO service2.sh.cvut.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757862AbZKEO4D convert rfc822-to-8bit (ORCPT ); Thu, 5 Nov 2009 09:56:03 -0500 Received: from localhost (localhost [127.0.0.1]) by service2.sh.cvut.cz (Postfix) with ESMTP id 307B13C0F7; Thu, 5 Nov 2009 15:56:06 +0100 (CET) Received: from service2.sh.cvut.cz ([127.0.0.1]) by localhost (service2.sh.cvut.cz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 13163-10; Thu, 5 Nov 2009 15:55:56 +0100 (CET) Received: from mykubuntu.localnet (unknown [IPv6:2001:718:2:91:216:d4ff:fe57:5222]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by service2.sh.cvut.cz (Postfix) with ESMTP id A0B5A3BE70; Thu, 5 Nov 2009 15:55:56 +0100 (CET) From: =?utf-8?q?Luk=C3=A1=C5=A1_Karas?= To: Mauro Carvalho Chehab Subject: Re: [PATCH] add support for IR on FlyDVB Trio (saa7134) Date: Thu, 5 Nov 2009 15:55:54 +0100 User-Agent: KMail/1.12.2 (Linux/2.6.31muj12; KDE/4.3.2; x86_64; ; ) References: <200909101412.07415.lukas.karas@centrum.cz> <20091027100622.6de8899d@pedra.chehab.org> In-Reply-To: <20091027100622.6de8899d@pedra.chehab.org> Cc: linux-media@vger.kernel.org MIME-Version: 1.0 Message-Id: <200911051555.54586.lukas.karas@centrum.cz> X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at service2.sh.cvut.cz X-Spam-Status: No, hits=-101.0 tagged_above=-255.0 required=5.0 tests=ALL_TRUSTED, CRM114_SPAM_00, DNS_FROM_RFC_ABUSE, DNS_FROM_RFC_WHOIS, USER_IN_WHITELIST X-Spam-Level: Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org diff -uprN video.29e4ba1a09bc/ir-kbd-i2c.c video/ir-kbd-i2c.c --- video.29e4ba1a09bc/ir-kbd-i2c.c 2009-09-19 14:45:22.000000000 +0200 +++ video/ir-kbd-i2c.c 2009-09-21 20:59:30.000000000 +0200 @@ -438,6 +441,7 @@ static int ir_probe(struct i2c_client *c ir_type = IR_TYPE_RC5; ir_codes = &ir_codes_fusionhdtv_mce_table; break; + case 0x0b: case 0x7a: case 0x47: case 0x71: @@ -467,7 +471,7 @@ static int ir_probe(struct i2c_client *c ir_codes = &ir_codes_avermedia_cardbus_table; break; default: - dprintk(1, DEVNAME ": Unsupported i2c address 0x%02x\n", addr); + dprintk(1, ": Unsupported i2c address 0x%02x\n", addr); err = -ENODEV; goto err_out_free; } @@ -514,7 +518,7 @@ static int ir_probe(struct i2c_client *c /* Make sure we are all setup before going on */ if (!name || !ir->get_key || !ir_codes) { - dprintk(1, DEVNAME ": Unsupported device at address 0x%02x\n", + dprintk(1,": Unsupported device at address 0x%02x\n", addr); err = -ENODEV; goto err_out_free; @@ -722,6 +726,30 @@ static int ir_probe(struct i2c_adapter * ir_attach(adap, msg[0].addr, 0, 0); } + /* special case for LifeView FlyDVB Trio */ + if (adap->id == I2C_HW_SAA7134) { + u8 temp = 0; + msg.buf = &temp; + msg.addr = 0x0b; + msg.len = 1; + msg.flags = 0; + + /* send weak up message to pic16C505 chip @ LifeView FlyDVB Trio */ + if (1 != i2c_transfer(adap,&msg,1)) { + dprintk(1,"send wake up byte to pic16C505 failed\n"); + }else{ + msg.flags = I2C_M_RD; + rc = i2c_transfer(adap, &msg, 1); + dprintk(1, "probe 0x%02x @ %s: %s\n", + msg.addr, adap->name, + (1 == rc) ? "yes" : "no"); + if (1 == rc) + ir_attach(adap, msg.addr, 0, 0); + } + msg.len = 0; + msg.flags = I2C_M_RD; + } + return 0; } #else diff -uprN video.29e4ba1a09bc/saa7134/saa7134-cards.c video/saa7134/saa7134-cards.c --- video.29e4ba1a09bc/saa7134/saa7134-cards.c 2009-09-19 14:45:22.000000000 +0200 +++ video/saa7134/saa7134-cards.c 2009-09-21 20:34:48.000000000 +0200 @@ -7239,9 +7239,27 @@ int saa7134_board_init2(struct saa7134_d } case SAA7134_BOARD_FLYDVB_TRIO: { + u8 temp = 0; + int rc; u8 data[] = { 0x3c, 0x33, 0x62}; struct i2c_msg msg = {.addr=0x09, .flags=0, .buf=data, .len = sizeof(data)}; i2c_transfer(&dev->i2c_adap, &msg, 1); + + /* send weak up message to pic16C505 chip @ LifeView FlyDVB Trio */ + msg.buf = &temp; + msg.addr = 0x0b; + msg.len = 1; + if (1 != i2c_transfer(&dev->i2c_adap,&msg,1)) { + printk(KERN_WARNING "%s: send wake up byte to pic16C505" + "(IR chip) failed\n", dev->name); + }else{ + msg.flags = I2C_M_RD; + rc = i2c_transfer(&dev->i2c_adap, &msg, 1); + printk(KERN_INFO "%s: probe IR chip @ i2c 0x%02x: %s\n", + dev->name, msg.addr,(1 == rc) ? "yes" : "no"); + if (rc == 1) + dev->has_remote = SAA7134_REMOTE_I2C; + } break; } case SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331: diff -uprN video.29e4ba1a09bc/saa7134/saa7134-input.c video/saa7134/saa7134-input.c --- video.29e4ba1a09bc/saa7134/saa7134-input.c 2009-09-19 14:45:22.000000000 +0200 +++ video/saa7134/saa7134-input.c 2009-09-21 20:35:39.000000000 +0200 @@ -132,6 +132,74 @@ static int build_key(struct saa7134_dev /* --------------------- Chip specific I2C key builders ----------------- */ +static int get_key_flydvb_trio(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw) +{ + int gpio; + int attempt = 0; + unsigned char b; + + /* We need this to access GPI Used by the saa_readl macro. */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) + struct saa7134_dev *dev = ir->c.adapter->algo_data; +#else + struct saa7134_dev *dev = ir->c->adapter->algo_data; +#endif + + if (dev == NULL) { + dprintk ("get_key_flydvb_trio: " +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) + "gir->c.adapter->algo_data is NULL!\n"); +#else + "gir->c->adapter->algo_data is NULL!\n"); +#endif + return -EIO; + } + + /* rising SAA7134_GPIGPRESCAN reads the status */ + saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN); + saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN); + + gpio = saa_readl(SAA7134_GPIO_GPSTATUS0 >> 2); + + if (0x40000 &~ gpio) + return 0; /* No button press */ + + /* No button press - only before first key pressed */ + if (b == 0xFF) + return 0; + + /* poll IR chip */ + /* weak up the IR chip */ + b = 0; + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) + while(1 != i2c_master_send(&ir->c, &b,1)) { +#else + while(1 != i2c_master_send(ir->c, &b,1)) { +#endif + if ((attempt++) < 10){ + msleep(10); /* wait a bit for next attempt - I don't know + how make it better */ + continue; + } + i2cdprintk("send wake up byte to pic16C505 (IR chip)" + "failed %dx\n", attempt); + return -EIO; + } +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) + if (1 != i2c_master_recv(&ir->c, &b, 1)) { +#else + if (1 != i2c_master_recv(ir->c, &b, 1)) { +#endif + i2cdprintk("read error\n"); + return -EIO; + } + + *ir_key = b; + *ir_raw = b; + return 1; +} + static int get_key_msi_tvanywhere_plus(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw) { @@ -878,6 +946,18 @@ void saa7134_probe_i2c_ir(struct saa7134 dev->info.addr = 0x40; #endif break; + case SAA7134_BOARD_FLYDVB_TRIO: +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) + snprintf(ir->c.name, sizeof(ir->c.name), "FlyDVB Trio"); + ir->get_key = get_key_flydvb_trio; + ir->ir_codes = ir_codes_flydvb_table; +#else + dev->init_data.name = "FlyDVB Trio"; + dev->init_data.get_key = get_key_flydvb_trio; + dev->init_data.ir_codes = &ir_codes_flydvb_table; + dev->info.addr = 0x0b; +#endif + break; } #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)