From patchwork Mon Mar 29 16:51:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Ringel X-Patchwork-Id: 89017 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 o2TGqYGx032411 for ; Mon, 29 Mar 2010 16:52:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754606Ab0C2Qwc (ORCPT ); Mon, 29 Mar 2010 12:52:32 -0400 Received: from mail-in-07.arcor-online.net ([151.189.21.47]:53039 "EHLO mail-in-07.arcor-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752673Ab0C2Qwa (ORCPT ); Mon, 29 Mar 2010 12:52:30 -0400 Received: from mail-in-11-z2.arcor-online.net (mail-in-11-z2.arcor-online.net [151.189.8.28]) by mx.arcor.de (Postfix) with ESMTP id DAAA33CA525; Mon, 29 Mar 2010 18:52:27 +0200 (CEST) Received: from mail-in-09.arcor-online.net (mail-in-09.arcor-online.net [151.189.21.49]) by mail-in-11-z2.arcor-online.net (Postfix) with ESMTP id B758AD46FE; Mon, 29 Mar 2010 18:52:27 +0200 (CEST) Received: from localhost.localdomain (dslb-188-103-199-168.pools.arcor-ip.net [188.103.199.168]) (Authenticated sender: stefan.ringel@arcor.de) by mail-in-09.arcor-online.net (Postfix) with ESMTPA id 580A01AF556; Mon, 29 Mar 2010 18:52:27 +0200 (CEST) X-DKIM: Sendmail DKIM Filter v2.8.2 mail-in-09.arcor-online.net 580A01AF556 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arcor.de; s=mail-in; t=1269881547; bh=/PERZ7dUVpY7v+Ra3hdeRe3kfJobQ24K/pDZSIinPRU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=trtLUtmLWFm63CRZSSq7taP3Iao5E2r0QTXfFiwyMdD8yKeEpZHg1cHfTUWSdp2yF 91w5sSQE2i79zRSAQyl0fTM7hP0wf6SFCtvdyNgYYA+Yd0vkoPPe4MwCRMsJQk2vKd +YiRXrp99V/DmX7WmV5jAfyKOlQY0VOrOrp8Z5RQ= From: stefan.ringel@arcor.de To: linux-media@vger.kernel.org Cc: mchehab@redhat.com, dheitmueller@kernellabs.com, Stefan Ringel Subject: [PATCH 3/3] tm6000: add gpios for tm6010 generic board Date: Mon, 29 Mar 2010 18:51:12 +0200 Message-Id: <1269881472-28245-3-git-send-email-stefan.ringel@arcor.de> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1269881472-28245-2-git-send-email-stefan.ringel@arcor.de> References: <1269881472-28245-1-git-send-email-stefan.ringel@arcor.de> <1269881472-28245-2-git-send-email-stefan.ringel@arcor.de> 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]); Mon, 29 Mar 2010 16:52:34 +0000 (UTC) diff --git a/drivers/staging/tm6000/tm6000-cards.c b/drivers/staging/tm6000/tm6000-cards.c index ab187c3..2f0274d 100644 --- a/drivers/staging/tm6000/tm6000-cards.c +++ b/drivers/staging/tm6000/tm6000-cards.c @@ -109,12 +109,22 @@ struct tm6000_board tm6000_boards[] = { .type = TM6010, .tuner_type = TUNER_XC2028, .tuner_addr = 0xc2 >> 1, + .demod_addr = 0x1e >> 1, .caps = { .has_tuner = 1, .has_dvb = 1, + .has_zl10353 = 1, + .has_eeprom = 1, + .has_remote = 1, }, .gpio = { - .tuner_reset = TM6010_GPIO_4, + .tuner_reset = TM6010_GPIO_2, + .tuner_on = TM6010_GPIO_3, + .demod_reset = TM6010_GPIO_1, + .demod_on = TM6010_GPIO_4, + .power_led = TM6010_GPIO_7, + .dvb_led = TM6010_GPIO_5, + .ir = TM6010_GPIO_0, }, }, [TM5600_BOARD_10MOONS_UT821] = { @@ -400,6 +410,7 @@ int tm6000_cards_setup(struct tm6000_core *dev) case TM6010_BOARD_HAUPPAUGE_900H: case TM6010_BOARD_TERRATEC_CINERGY_HYBRID_XE: case TM6010_BOARD_TWINHAN_TU501: + case TM6010_BOARD_GENERIC: /* Turn xceive 3028 on */ tm6000_set_reg(dev, REQ_03_SET_GET_MCU_PIN, dev->gpio.tuner_on, 0x01); msleep(15);