From patchwork Mon Apr 19 09:50:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 93449 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 o3J9pLAN020468 for ; Mon, 19 Apr 2010 09:51:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752799Ab0DSJvU (ORCPT ); Mon, 19 Apr 2010 05:51:20 -0400 Received: from compulab.co.il ([67.18.134.219]:52429 "EHLO compulab.co.il" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752650Ab0DSJvU (ORCPT ); Mon, 19 Apr 2010 05:51:20 -0400 Received: from [62.90.235.247] (helo=zimbra-mta.compulab.co.il) by compulab.site5.com with esmtp (Exim 4.69) (envelope-from ) id 1O3ndO-0001iu-SW for linux-omap@vger.kernel.org; Mon, 19 Apr 2010 04:51:19 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by zimbra-mta.compulab.co.il (Postfix) with ESMTP id C6C3D9A028A for ; Mon, 19 Apr 2010 12:51:17 +0300 (IDT) Received: from zimbra-mta.compulab.co.il ([127.0.0.1]) by localhost (zimbra-mta.compulab.co.il [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id shDfB7vgyGDx; Mon, 19 Apr 2010 12:51:17 +0300 (IDT) Received: from droid.compulab.local (droid.compulab.local [10.1.1.77]) by zimbra-mta.compulab.co.il (Postfix) with ESMTP id 6F0C59A0270; Mon, 19 Apr 2010 12:51:17 +0300 (IDT) Received: from droid.compulab.local (localhost [127.0.0.1]) by droid.compulab.local (8.14.0/8.14.0) with ESMTP id o3J9oL4h005706; Mon, 19 Apr 2010 12:50:21 +0300 Received: (from mike@localhost) by droid.compulab.local (8.14.4/8.14.0/Submit) id o3J9oKMW005705; Mon, 19 Apr 2010 12:50:20 +0300 X-Authentication-Warning: droid.compulab.local: mike set sender to mike@compulab.co.il using -f From: Mike Rapoport To: linux-omap@vger.kernel.org Cc: Mike Rapoport Subject: [PATCH] OMAP: fix gpmc nand setup when no timings supplied Date: Mon, 19 Apr 2010 12:50:18 +0300 Message-Id: <1271670618-5671-1-git-send-email-mike@compulab.co.il> X-Mailer: git-send-email 1.6.6.2 X-ACL-Warn: { X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - compulab.site5.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - compulab.co.il X-Source: X-Source-Args: X-Source-Dir: 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]); Mon, 19 Apr 2010 09:51:31 +0000 (UTC) diff --git a/arch/arm/mach-omap2/gpmc-nand.c b/arch/arm/mach-omap2/gpmc-nand.c index 64d74f0..3629da3 100644 --- a/arch/arm/mach-omap2/gpmc-nand.c +++ b/arch/arm/mach-omap2/gpmc-nand.c @@ -83,6 +83,11 @@ static int gpmc_nand_setup(void) { struct device *dev = &gpmc_nand_device.dev; + if (!gpmc_nand_data->gpmc_t) { + dev_info(dev, "Keeping gpmc timings\n"); + return 0; + } + /* Set timings in GPMC */ if (omap2_nand_gpmc_retime() < 0) { dev_err(dev, "Unable to set gpmc timings\n");