From patchwork Sat Aug 22 08:00:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santosh Shilimkar X-Patchwork-Id: 43301 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n7M80sH5002774 for ; Sat, 22 Aug 2009 08:00:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754301AbZHVIAv (ORCPT ); Sat, 22 Aug 2009 04:00:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754821AbZHVIAv (ORCPT ); Sat, 22 Aug 2009 04:00:51 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:51962 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754301AbZHVIAu (ORCPT ); Sat, 22 Aug 2009 04:00:50 -0400 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id n7M80KcH025125; Sat, 22 Aug 2009 03:00:26 -0500 Received: from linfarm476.india.ti.com (localhost [127.0.0.1]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id n7M80Et5007965; Sat, 22 Aug 2009 13:30:15 +0530 (IST) Received: from linfarm476.india.ti.com (localhost [127.0.0.1]) by linfarm476.india.ti.com (8.12.11/8.12.11) with ESMTP id n7M80EgY005320; Sat, 22 Aug 2009 13:30:14 +0530 Received: (from a0393909@localhost) by linfarm476.india.ti.com (8.12.11/8.12.11/Submit) id n7M80DsF005318; Sat, 22 Aug 2009 13:30:13 +0530 From: Santosh Shilimkar To: tony@atomide.com, khilman@deeprootsystems.com, rmk@arm.linux.org.uk Cc: linux-arm-kernel@lists.infradead.org, linux-arm-kernel@lists.arm.linux.org.uk, linux-omap@vger.kernel.org, Santosh Shilimkar , Syed Rafiuddin Subject: [PATCH 2/2 v2] ARM: OMAP4: Bypass the clock check. Date: Sat, 22 Aug 2009 13:30:12 +0530 Message-Id: <1250928012-5233-2-git-send-email-santosh.shilimkar@ti.com> X-Mailer: git-send-email 1.5.5 In-Reply-To: <1250928012-5233-1-git-send-email-santosh.shilimkar@ti.com> References: <1250928012-5233-1-git-send-email-santosh.shilimkar@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Second reason of OMAP4 boot failure on 2.6.31.rc6, the UART platform data is not getting registered to kernel. Registration was failing because of clock check failure in omap_serial_init(). Below patch fix the same. OMAP4 clock framework patches are still getting discussed on mailing list so till then we need this. Signed-off-by: Syed Rafiuddin Signed-off-by: Santosh Shilimkar Acked-by: Tony Lindgren Acked-by: Kevin Hilman --- arch/arm/mach-omap2/serial.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index e1be77b..6bbdfe0 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -620,8 +620,11 @@ void __init omap_serial_init(void) uart->fck = NULL; } - if (!uart->ick || !uart->fck) - continue; + /* FIXME: Remove this once the clkdev is ready */ + if (!cpu_is_omap44xx()) { + if (!uart->ick || !uart->fck) + continue; + } uart->num = i; p->private_data = uart;