From patchwork Wed Apr 28 01:05:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 95540 X-Patchwork-Delegate: tony@atomide.com 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 o3S19BEA004502 for ; Wed, 28 Apr 2010 01:09:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754719Ab0D1BJJ (ORCPT ); Tue, 27 Apr 2010 21:09:09 -0400 Received: from d1.icnet.pl ([212.160.220.21]:40603 "EHLO d1.icnet.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752688Ab0D1BJI (ORCPT ); Tue, 27 Apr 2010 21:09:08 -0400 Received: from 87-205-12-81.ip.netia.com.pl ([87.205.12.81] helo=vclass.intranet) by d1.icnet.pl with asmtp (TLS-1.0:DHE_RSA_AES_128_CBC_SHA:16) (Exim 4.34) id 1O6vlz-0006rx-ML; Wed, 28 Apr 2010 03:09:07 +0200 From: Janusz Krzysztofik Organization: Tele-Info-System, Poznan, PL To: linux-omap@vger.kernel.org Subject: [PATCH v4 2.1/5(7)] OMAP1: Amstrad Delta: update board initialization code for complete modem IRQ GPIO line setup Date: Wed, 28 Apr 2010 03:05:47 +0200 User-Agent: KMail/1.9.10 Cc: Tony Lindgren , linux-arm-kernel@lists.infradead.org, e3-hacking@earth.li References: <201004280252.58420.jkrzyszt@tis.icnet.pl> In-Reply-To: <201004280252.58420.jkrzyszt@tis.icnet.pl> MIME-Version: 1.0 Content-Disposition: inline Message-Id: <201004280305.49347.jkrzyszt@tis.icnet.pl> X-SA-Exim-Scanned: No (on d1.icnet); SAEximRunCond expanded to false 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 (demeter.kernel.org [140.211.167.41]); Wed, 28 Apr 2010 01:09:11 +0000 (UTC) --- git.orig/arch/arm/mach-omap1/board-ams-delta.c 2010-04-27 21:40:22.000000000 +0200 +++ git/arch/arm/mach-omap1/board-ams-delta.c 2010-04-27 22:34:42.000000000 +0200 @@ -263,8 +263,18 @@ static struct platform_device ams_delta_ static int __init ams_delta_modem_init(void) { + int err; + omap_cfg_reg(M14_1510_GPIO2); - ams_delta_modem_ports[0].irq = gpio_to_irq(2); + ams_delta_modem_ports[0].irq = + gpio_to_irq(AMS_DELTA_GPIO_PIN_MODEM_IRQ); + + err = gpio_request(AMS_DELTA_GPIO_PIN_MODEM_IRQ, "modem"); + if (err) { + pr_err("Couldn't request gpio pin for modem\n"); + return err; + } + gpio_direction_input(AMS_DELTA_GPIO_PIN_MODEM_IRQ); ams_delta_latch2_write( AMS_DELTA_LATCH2_MODEM_NRESET | AMS_DELTA_LATCH2_MODEM_CODEC,