From patchwork Mon Feb 14 02:32:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 553281 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 p1DISt6U022252 for ; Sun, 13 Feb 2011 18:31:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754699Ab1BMSbF (ORCPT ); Sun, 13 Feb 2011 13:31:05 -0500 Received: from ch1outboundpool.messaging.microsoft.com ([216.32.181.181]:46995 "EHLO ch1outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754676Ab1BMSbE (ORCPT ); Sun, 13 Feb 2011 13:31:04 -0500 Received: from mail66-ch1-R.bigfish.com (216.32.181.170) by CH1EHSOBE003.bigfish.com (10.43.70.53) with Microsoft SMTP Server id 14.1.225.8; Sun, 13 Feb 2011 18:31:02 +0000 Received: from mail66-ch1 (localhost.localdomain [127.0.0.1]) by mail66-ch1-R.bigfish.com (Postfix) with ESMTP id 5F91DB083E6; Sun, 13 Feb 2011 18:31:02 +0000 (UTC) X-SpamScore: -3 X-BigFish: VS-3(zzbb2cKzz1202hzz8275bhz2dh2a8h668h61h) X-Spam-TCS-SCL: 0:0 X-Forefront-Antispam-Report: KIP:(null); UIP:(null); IPVD:NLI; H:de01egw01.freescale.net; RD:de01egw01.freescale.net; EFVD:NLI Received: from mail66-ch1 (localhost.localdomain [127.0.0.1]) by mail66-ch1 (MessageSwitch) id 1297621862197979_6245; Sun, 13 Feb 2011 18:31:02 +0000 (UTC) Received: from CH1EHSMHS013.bigfish.com (snatpool1.int.messaging.microsoft.com [10.43.68.248]) by mail66-ch1.bigfish.com (Postfix) with ESMTP id 294CD110004D; Sun, 13 Feb 2011 18:31:02 +0000 (UTC) Received: from de01egw01.freescale.net (192.88.165.102) by CH1EHSMHS013.bigfish.com (10.43.70.13) with Microsoft SMTP Server (TLS) id 14.1.225.8; Sun, 13 Feb 2011 18:31:01 +0000 Received: from az33smr01.freescale.net (az33smr01.freescale.net [10.64.34.199]) by de01egw01.freescale.net (8.14.3/8.14.3) with ESMTP id p1DIUv2t014098; Sun, 13 Feb 2011 11:30:57 -0700 (MST) Received: from S2101-09.ap.freescale.net (mvp-10-192-184-6.ap.freescale.net [10.192.184.6]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id p1DIUgKE022479; Sun, 13 Feb 2011 12:30:53 -0600 (CST) From: Shawn Guo To: , , , , , CC: Shawn Guo Subject: [PATCH v2 3/7] ARM: mxs: make ssp error irq definition consistent Date: Mon, 14 Feb 2011 10:32:22 +0800 Message-ID: <1297650746-12841-4-git-send-email-shawn.guo@freescale.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1297650746-12841-1-git-send-email-shawn.guo@freescale.com> References: <1297650746-12841-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]); Sun, 13 Feb 2011 18:31:06 +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