From patchwork Wed Feb 8 16:53:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hartley Sweeten X-Patchwork-Id: 140182 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (unknown [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8669CB71AA for ; Thu, 9 Feb 2012 03:57:43 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RvAnx-0002ET-1D; Wed, 08 Feb 2012 16:55:37 +0000 Received: from mail131.messagelabs.com ([216.82.242.99]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RvAnt-0002E6-Kl for linux-arm-kernel@lists.infradead.org; Wed, 08 Feb 2012 16:55:34 +0000 X-Env-Sender: hartleys@visionengravers.com X-Msg-Ref: server-5.tower-131.messagelabs.com!1328720099!11622191!27 X-Originating-IP: [216.166.12.69] X-StarScan-Version: 6.5.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14934 invoked from network); 8 Feb 2012 16:55:29 -0000 Received: from out001.collaborationhost.net (HELO out001.collaborationhost.net) (216.166.12.69) by server-5.tower-131.messagelabs.com with RC4-SHA encrypted SMTP; 8 Feb 2012 16:55:29 -0000 Received: from etch.local (10.2.3.210) by smtp.collaborationhost.net (10.2.0.118) with Microsoft SMTP Server (TLS) id 8.3.137.0; Wed, 8 Feb 2012 10:55:06 -0600 From: H Hartley Sweeten To: ARM Kernel Subject: [PATCH] ep93xx: fix build of vision_ep93xx.c Date: Wed, 8 Feb 2012 09:53:44 -0700 User-Agent: KMail/1.9.9 MIME-Version: 1.0 Content-Disposition: inline Message-ID: <201202080953.44853.hartleys@visionengravers.com> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [216.82.242.99 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Ryan Mallon X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Fix build breakage due to the following commits: Commit bd5f12a24766c1f299def0a78b008d4746f528f2   ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics Commit 257af9f9725aa8a863b306659208a031135d59e7   ARM: 7041/1: gpio-ep93xx: hookup the to_irq callback in the driver The vision_ep9307 machine uses the ep93xx build-in gpios and needs to include to pickup the defines. The gpio_to_irq() call is now a callback to the gpio-ep93xx.c driver and cannot be used as a constant initializer for the .irq member of struct i2c_board_info. Signed-off-by: Hartley Sweeten Acked-by: Ryan Mallon Acked-by: Mika Westerberg diff --git a/arch/arm/mach-ep93xx/vision_ep9307.c b/arch/arm/mach-ep93xx/vision_ep9307.c index 03dd401..d5fb44f 100644 --- a/arch/arm/mach-ep93xx/vision_ep9307.c +++ b/arch/arm/mach-ep93xx/vision_ep9307.c @@ -32,6 +32,7 @@  #include  #include  #include +#include    #include  #include @@ -153,7 +154,6 @@ static struct i2c_board_info vision_i2c_info[] __initdata = {         }, {                 I2C_BOARD_INFO("pca9539", 0x74),                 .platform_data  = &pca953x_74_gpio_data, -               .irq            = gpio_to_irq(EP93XX_GPIO_LINE_F(7)),         }, {                 I2C_BOARD_INFO("pca9539", 0x75),                 .platform_data  = &pca953x_75_gpio_data, @@ -348,6 +348,8 @@ static void __init vision_init_machine(void)                                 "pca9539:74"))                 pr_warn("cannot request interrupt gpio for pca9539:74\n");   +       vision_i2c_info[1].irq = gpio_to_irq(EP93XX_GPIO_LINE_F(7)); +         ep93xx_register_i2c(&vision_i2c_gpio_data, vision_i2c_info,                                 ARRAY_SIZE(vision_i2c_info));         ep93xx_register_spi(&vision_spi_master, vision_spi_board_info,