From patchwork Sat Feb 5 02:18:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 532341 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p14II5E8009382 for ; Fri, 4 Feb 2011 18:18:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750847Ab1BDSSE (ORCPT ); Fri, 4 Feb 2011 13:18:04 -0500 Received: from tx2ehsobe004.messaging.microsoft.com ([65.55.88.14]:42813 "EHLO TX2EHSOBE007.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750799Ab1BDSSE (ORCPT ); Fri, 4 Feb 2011 13:18:04 -0500 Received: from mail46-tx2-R.bigfish.com (10.9.14.246) by TX2EHSOBE007.bigfish.com (10.9.40.27) with Microsoft SMTP Server id 14.1.225.8; Fri, 4 Feb 2011 18:18:02 +0000 Received: from mail46-tx2 (localhost.localdomain [127.0.0.1]) by mail46-tx2-R.bigfish.com (Postfix) with ESMTP id 22459E9812E; Fri, 4 Feb 2011 18:18:02 +0000 (UTC) X-SpamScore: -3 X-BigFish: VS-3(zzbb2cKzz1202hzz8275bhz2dh2a8h668h) X-Forefront-Antispam-Report: KIP:(null); UIP:(null); IPVD:NLI; H:de01egw01.freescale.net; RD:de01egw01.freescale.net; EFVD:NLI Received: from mail46-tx2 (localhost.localdomain [127.0.0.1]) by mail46-tx2 (MessageSwitch) id 129684348214267_28433; Fri, 4 Feb 2011 18:18:02 +0000 (UTC) Received: from TX2EHSMHS043.bigfish.com (unknown [10.9.14.254]) by mail46-tx2.bigfish.com (Postfix) with ESMTP id 00704181804F; Fri, 4 Feb 2011 18:18:02 +0000 (UTC) Received: from de01egw01.freescale.net (192.88.165.102) by TX2EHSMHS043.bigfish.com (10.9.99.143) with Microsoft SMTP Server (TLS) id 14.1.225.8; Fri, 4 Feb 2011 18:18:01 +0000 Received: from az33smr02.freescale.net (az33smr02.freescale.net [10.64.34.200]) by de01egw01.freescale.net (8.14.3/8.14.3) with ESMTP id p14II0Ow007424; Fri, 4 Feb 2011 11:18:00 -0700 (MST) Received: from S2101-09.ap.freescale.net (mvp-10-192-184-3.ap.freescale.net [10.192.184.3]) by az33smr02.freescale.net (8.13.1/8.13.0) with ESMTP id p14IHlCS020234; Fri, 4 Feb 2011 12:17:57 -0600 (CST) From: Shawn Guo To: , , , , CC: Shawn Guo Subject: [PATCH 3/7] ARM: mxs: make ssp error irq definition consistent Date: Sat, 5 Feb 2011 10:18:43 +0800 Message-ID: <1296872327-21166-4-git-send-email-shawn.guo@freescale.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1296872327-21166-1-git-send-email-shawn.guo@freescale.com> References: <1296872327-21166-1-git-send-email-shawn.guo@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 04 Feb 2011 18:18:05 +0000 (UTC) diff --git a/arch/arm/mach-mxs/include/mach/mx23.h b/arch/arm/mach-mxs/include/mach/mx23.h index 1730c9c..e858692 100644 --- a/arch/arm/mach-mxs/include/mach/mx23.h +++ b/arch/arm/mach-mxs/include/mach/mx23.h @@ -93,7 +93,7 @@ #define MX23_INT_USB_WAKEUP 12 #define MX23_INT_GPMI_DMA 13 #define MX23_INT_SSP1_DMA 14 -#define MX23_INT_SSP_ERROR 15 +#define MX23_INT_SSP1_ERROR 15 #define MX23_INT_GPIO0 16 #define MX23_INT_GPIO1 17 #define MX23_INT_GPIO2 18 diff --git a/arch/arm/mach-mxs/include/mach/mx28.h b/arch/arm/mach-mxs/include/mach/mx28.h index 3f3485a..75d8611 100644 --- a/arch/arm/mach-mxs/include/mach/mx28.h +++ b/arch/arm/mach-mxs/include/mach/mx28.h @@ -163,10 +163,10 @@ #define MX28_INT_USB0 93 #define MX28_INT_USB1_WAKEUP 94 #define MX28_INT_USB0_WAKEUP 95 -#define MX28_INT_SSP0 96 -#define MX28_INT_SSP1 97 -#define MX28_INT_SSP2 98 -#define MX28_INT_SSP3 99 +#define MX28_INT_SSP0_ERROR 96 +#define MX28_INT_SSP1_ERROR 97 +#define MX28_INT_SSP2_ERROR 98 +#define MX28_INT_SSP3_ERROR 99 #define MX28_INT_ENET_SWI 100 #define MX28_INT_ENET_MAC0 101 #define MX28_INT_ENET_MAC1 102