From b0455bc79bfb4084f83e02cd37a35fe7f11f620a Mon Sep 17 00:00:00 2001
From: Steve Muckle <smuckle@codeaurora.org>
Date: Sat, 28 Nov 2009 13:00:13 -0800
Subject: [PATCH] --- yaml --- r: 212608 b: refs/heads/master c:
 ed1f31b4b742647e2ec18c885e65fbef484eaf58 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../arm/mach-msm/include/mach/irqs-8x60.h     | 28 +++++++++++++++++++
 trunk/arch/arm/mach-msm/include/mach/irqs.h   |  2 ++
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 trunk/arch/arm/mach-msm/include/mach/irqs-8x60.h

diff --git a/[refs] b/[refs]
index c22d4db1fb07..7692320422b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6cf6dfefe1f07f309998df8734fdc0961dbae38c
+refs/heads/master: ed1f31b4b742647e2ec18c885e65fbef484eaf58
diff --git a/trunk/arch/arm/mach-msm/include/mach/irqs-8x60.h b/trunk/arch/arm/mach-msm/include/mach/irqs-8x60.h
new file mode 100644
index 000000000000..cd9c8dc538fc
--- /dev/null
+++ b/trunk/arch/arm/mach-msm/include/mach/irqs-8x60.h
@@ -0,0 +1,28 @@
+/* Copyright (c) 2010 Code Aurora Forum. All rights reserved.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef __ASM_ARCH_MSM_IRQS_8X60_H
+#define __ASM_ARCH_MSM_IRQS_8X60_H
+
+/* MSM ACPU Interrupt Numbers */
+
+/* 0-15:  STI/SGI (software triggered/generated interrupts)
+ * 16-31: PPI (private peripheral interrupts)
+ * 32+:   SPI (shared peripheral interrupts)
+ */
+
+#define NR_GPIO_IRQS 173
+#define NR_MSM_IRQS 256
+#define NR_BOARD_IRQS 0
+
+#endif
diff --git a/trunk/arch/arm/mach-msm/include/mach/irqs.h b/trunk/arch/arm/mach-msm/include/mach/irqs.h
index 164d355c96ea..8679a4564744 100644
--- a/trunk/arch/arm/mach-msm/include/mach/irqs.h
+++ b/trunk/arch/arm/mach-msm/include/mach/irqs.h
@@ -24,6 +24,8 @@
 #elif defined(CONFIG_ARCH_QSD8X50)
 #include "irqs-8x50.h"
 #include "sirc.h"
+#elif defined(CONFIG_ARCH_MSM8X60)
+#include "irqs-8x60.h"
 #elif defined(CONFIG_ARCH_MSM_ARM11)
 #include "irqs-7x00.h"
 #else