From patchwork Fri Mar 19 13:52:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 86940 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 o2JDqSXc029524 for ; Fri, 19 Mar 2010 13:52:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752256Ab0CSNw2 (ORCPT ); Fri, 19 Mar 2010 09:52:28 -0400 Received: from mail.gmx.net ([213.165.64.20]:41055 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751552Ab0CSNw1 (ORCPT ); Fri, 19 Mar 2010 09:52:27 -0400 Received: (qmail invoked by alias); 19 Mar 2010 13:52:25 -0000 Received: from p57BD1C26.dip0.t-ipconnect.de (EHLO axis700.grange) [87.189.28.38] by mail.gmx.net (mp019) with SMTP; 19 Mar 2010 14:52:25 +0100 X-Authenticated: #20450766 X-Provags-ID: V01U2FsdGVkX1+A0Ao3DCWA/HyfwojkdZ2AdNTIXLBVPC+AU5dl0M vYBxomMWy9mepa Received: from lyakh (helo=localhost) by axis700.grange with local-esmtp (Exim 4.63) (envelope-from ) id 1Nscct-0001qd-H9; Fri, 19 Mar 2010 14:52:35 +0100 Date: Fri, 19 Mar 2010 14:52:35 +0100 (CET) From: Guennadi Liakhovetski To: "linux-sh@vger.kernel.org" cc: Magnus Damm Subject: [PATCH] SH: fix SCIFA SCASCR register bit definitions Message-ID: MIME-Version: 1.0 X-Y-GMX-Trusted: 0 X-FuHaFi: 0.53000000000000003 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@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]); Fri, 19 Mar 2010 13:52:29 +0000 (UTC) diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h index 988dc87..5ac23c0 100644 --- a/drivers/serial/sh-sci.h +++ b/drivers/serial/sh-sci.h @@ -96,7 +96,9 @@ # define SCSCR_INIT(port) 0x0038 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ #elif defined(CONFIG_CPU_SUBTYPE_SH7724) # define SCIF_ORER 0x0001 /* overrun error bit */ -# define SCSCR_INIT(port) 0x0038 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ +# define SCSCR_INIT(port) ((port)->type == PORT_SCIFA ? \ + 0x30 /* TIE=0,RIE=0,TE=1,RE=1 */ : \ + 0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ ) #elif defined(CONFIG_CPU_SUBTYPE_SH4_202) # define SCSPTR2 0xffe80020 /* 16 bit SCIF */ # define SCIF_ORER 0x0001 /* overrun error bit */ @@ -199,6 +201,8 @@ defined(CONFIG_CPU_SUBTYPE_SH7786) || \ defined(CONFIG_CPU_SUBTYPE_SHX3) #define SCI_CTRL_FLAGS_REIE 0x08 /* 7750 SCIF */ +#elif defined(CONFIG_CPU_SUBTYPE_SH7724) +#define SCI_CTRL_FLAGS_REIE ((port)->type == PORT_SCIFA ? 0 : 8) #else #define SCI_CTRL_FLAGS_REIE 0 #endif