From patchwork Tue Dec 21 17:46:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Nikula X-Patchwork-Id: 424751 X-Patchwork-Delegate: tony@atomide.com 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 oBLHkNN7009276 for ; Tue, 21 Dec 2010 17:46:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751548Ab0LURqW (ORCPT ); Tue, 21 Dec 2010 12:46:22 -0500 Received: from mail-bw0-f45.google.com ([209.85.214.45]:35477 "EHLO mail-bw0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751240Ab0LURqW (ORCPT ); Tue, 21 Dec 2010 12:46:22 -0500 Received: by bwz16 with SMTP id 16so4845789bwz.4 for ; Tue, 21 Dec 2010 09:46:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=+ma5YZt92LmBSwD8+dz3UXcAOM1e+sFKXTR1gf4RbBs=; b=lB/1p/dv94k9hm29Mu5lNR+8pCinMUaJBnbG5VQVqN5QSLYwWgXUNZQBztsnOjw6TE HOG6Kb+G6JbBJHg67L8Kv+ZrOpGJ1sHxZG4mdHM0c/FQbDg1XZQRsG9DQVLU9O0GfGJX +D08/nFVofKiek6SFFv1WRlwscV3PhhRinlG4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=RViairkS8k8kd2Lnb1D29OvGjPD8l1C39XUylVi6NOtLzf8yd+brimZD+uo0uTmeNs lDClHAribUKJ1skVVO2O0mDJxrpVftuKZvwa7Y+rRLPRgZ9mUdXZ+kiVf3AGIvz8fpid JStc3YbqJNN3DJxtDav7OvMzBB2jsepMbY7aY= Received: by 10.204.116.5 with SMTP id k5mr5039118bkq.73.1292953580580; Tue, 21 Dec 2010 09:46:20 -0800 (PST) Received: from localhost (host-94-101-4-66.igua.fi [94.101.4.66]) by mx.google.com with ESMTPS id p22sm4397268bkp.9.2010.12.21.09.46.18 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 21 Dec 2010 09:46:19 -0800 (PST) From: Jarkko Nikula To: linux-omap@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Tony Lindgren , Jarkko Nikula , Srikar Subject: [PATCH] omap: rx51: Remove tvout code that plays with gpio 40 Date: Tue, 21 Dec 2010 19:46:01 +0200 Message-Id: <1292953561-22979-1-git-send-email-jhnikula@gmail.com> X-Mailer: git-send-email 1.7.2.3 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@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]); Tue, 21 Dec 2010 17:46:24 +0000 (UTC) diff --git a/arch/arm/mach-omap2/board-rx51-video.c b/arch/arm/mach-omap2/board-rx51-video.c index 9919581..acd6700 100644 --- a/arch/arm/mach-omap2/board-rx51-video.c +++ b/arch/arm/mach-omap2/board-rx51-video.c @@ -24,9 +24,6 @@ #include "mux.h" #define RX51_LCD_RESET_GPIO 90 -/* REVISIT to verify with rx51.c at sound/soc/omap */ -#define RX51_TVOUT_SEL_GPIO 40 - #if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE) @@ -41,17 +38,6 @@ static void rx51_lcd_disable(struct omap_dss_device *dssdev) gpio_set_value(dssdev->reset_gpio, 0); } -static int rx51_tvout_enable(struct omap_dss_device *dssdev) -{ - gpio_set_value(dssdev->reset_gpio, 1); - return 0; -} - -static void rx51_tvout_disable(struct omap_dss_device *dssdev) -{ - gpio_set_value(dssdev->reset_gpio, 0); -} - static struct omap_dss_device rx51_lcd_device = { .name = "lcd", .driver_name = "panel-acx565akm", @@ -67,9 +53,6 @@ static struct omap_dss_device rx51_tv_device = { .type = OMAP_DISPLAY_TYPE_VENC, .driver_name = "venc", .phy.venc.type = OMAP_DSS_VENC_TYPE_COMPOSITE, - .reset_gpio = RX51_TVOUT_SEL_GPIO, - .platform_enable = rx51_tvout_enable, - .platform_disable = rx51_tvout_disable, }; static struct omap_dss_device *rx51_dss_devices[] = { @@ -112,9 +95,6 @@ static int __init rx51_video_init(void) gpio_direction_output(RX51_LCD_RESET_GPIO, 1); - /* REVISIT to verify with rx51.c at sound/soc/omap */ - gpio_direction_output(RX51_TVOUT_SEL_GPIO, 1); - platform_add_devices(rx51_video_devices, ARRAY_SIZE(rx51_video_devices)); return 0;