From patchwork Mon Nov 16 22:53:56 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: vikram pandita X-Patchwork-Id: 60508 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 nAGMvL7N003438 for ; Mon, 16 Nov 2009 22:57:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754942AbZKPWyN (ORCPT ); Mon, 16 Nov 2009 17:54:13 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754938AbZKPWyL (ORCPT ); Mon, 16 Nov 2009 17:54:11 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:57590 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754931AbZKPWyJ (ORCPT ); Mon, 16 Nov 2009 17:54:09 -0500 Received: from dlep35.itg.ti.com ([157.170.170.118]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id nAGMsFO1020741 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 16 Nov 2009 16:54:15 -0600 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id nAGMsCdK011008; Mon, 16 Nov 2009 16:54:12 -0600 (CST) Received: from vip-tid (lta0307903-128247075087.am.dhcp.ti.com [128.247.75.87]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id nAGMsCZ14771; Mon, 16 Nov 2009 16:54:12 -0600 (CST) Received: from vip-tid (localhost.localdomain [127.0.0.1]) by vip-tid (Postfix) with ESMTP id D96BA29CB4A; Mon, 16 Nov 2009 16:53:57 -0600 (CST) Received: (from vikram@localhost) by vip-tid (8.14.3/8.14.3/Submit) id nAGMrvMo032018; Mon, 16 Nov 2009 16:53:57 -0600 X-Authentication-Warning: vip-tid: vikram set sender to vikram.pandita@ti.com using -f From: Vikram Pandita To: linux-omap@vger.kernel.org Cc: Vikram Pandita Subject: [PATCH 2/2] omap: serial: fix non-empty rx uart fifo abort Date: Mon, 16 Nov 2009 16:53:56 -0600 Message-Id: <1258412036-31986-1-git-send-email-vikram.pandita@ti.com> X-Mailer: git-send-email 1.6.5.1.69.g36942 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index 2e17b57..669652b 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -624,8 +624,15 @@ void __init omap_serial_early_init(void) uart->p = p; list_add_tail(&uart->node, &uart_list); - if (cpu_is_omap44xx()) + if (cpu_is_omap44xx()) { p->irq += 32; + /* Do not read empty UART fifo on omap4 */ + p->flags |= UPF_NO_EMPTY_FIFO_READ; + } + + /* Do not read empty UART fifo on omap3630 */ + if (cpu_is_omap3630()) + p->flags |= UPF_NO_EMPTY_FIFO_READ; omap_uart_enable_clocks(uart); }