From patchwork Mon Aug 27 07:36:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dirk Behme X-Patchwork-Id: 1376641 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id B79AC3FC71 for ; Mon, 27 Aug 2012 07:40:08 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T5tt5-0005Sx-Ui; Mon, 27 Aug 2012 07:37:32 +0000 Received: from smtp2-v.fe.bosch.de ([139.15.237.6]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1T5tse-0005Mo-Hp for linux-arm-kernel@lists.infradead.org; Mon, 27 Aug 2012 07:37:05 +0000 Received: from vsmta11.fe.internet.bosch.com (unknown [10.4.98.30]) by imta23.fe.bosch.de (Postfix) with ESMTP id 8043228C007E for ; Mon, 27 Aug 2012 09:37:02 +0200 (CEST) Received: from localhost (vsgw4.fe.internet.bosch.com [10.4.98.12]) by vsmta11.fe.internet.bosch.com (Postfix) with SMTP id 7715D43C071B for ; Mon, 27 Aug 2012 09:37:02 +0200 (CEST) Received: from FE-HUB1000.de.bosch.com (10.4.103.107) by si-hub07.de.bosch.com (10.3.153.132) with Microsoft SMTP Server (TLS) id 8.3.264.0; Mon, 27 Aug 2012 09:36:57 +0200 Received: from hi-z5661.hi.de.bosch.com (10.34.219.178) by FE-HUB1000.de.bosch.com (10.4.103.107) with Microsoft SMTP Server id 14.2.309.2; Mon, 27 Aug 2012 09:36:57 +0200 Received: from localhost.localdomain (localhost [127.0.0.1]) by hi-z5661.hi.de.bosch.com (Postfix) with ESMTP id 1DEB040AB7; Mon, 27 Aug 2012 09:36:57 +0200 (CEST) From: Dirk Behme To: , Subject: [PATCH 2/2] tty: serial: imx: don't reinit clock with enabled console Date: Mon, 27 Aug 2012 09:36:52 +0200 Message-ID: <1346053012-25686-3-git-send-email-dirk.behme@de.bosch.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1346053012-25686-1-git-send-email-dirk.behme@de.bosch.com> References: <1346053012-25686-1-git-send-email-dirk.behme@de.bosch.com> MIME-Version: 1.0 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -6.9 (------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-6.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [139.15.237.6 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: kernel@pengutronix.de, Greg Kroah-Hartman , Sascha Hauer , Xinyu Chen , Shawn Guo , Alan Cox X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Xinyu Chen Remove the imx_setup_ufcr() call on startup when CONSOLE enabled, as this will cause clock reinit, and output garbage. This patch is a port from Freescale's Android kernel. Signed-off-by: Xinyu Chen Tested-by: Dirk Behme CC: Shawn Guo CC: Sascha Hauer --- drivers/tty/serial/imx.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index 908178f..31ce414 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -695,7 +695,9 @@ static int imx_startup(struct uart_port *port) int retval; unsigned long flags, temp; +#ifndef CONFIG_SERIAL_CORE_CONSOLE imx_setup_ufcr(sport, 0); +#endif /* disable the DREN bit (Data Ready interrupt enable) before * requesting IRQs