---

yaml --- r: 319653 b: refs/heads/master c: 57d7cdb h: refs/heads/master i: 319651: 1a0425c v: v3
git-mirror · Jul 24, 2012 · d939f32 · d939f32
1 parent ea0b8c6
commit d939f32
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1004165f346ac17ea8615bac26398d70c9d6689b
+refs/heads/master: 57d7cdb630716c3f9cf7beadd05059c65a9acd25
diff --git a/trunk/arch/mips/include/asm/netlogic/xlp-hal/xlp.h b/trunk/arch/mips/include/asm/netlogic/xlp-hal/xlp.h
@@ -47,6 +47,9 @@
 #define PIC_OHCI_1_IRQ			26
 #define PIC_OHCI_2_IRQ			27
 #define PIC_OHCI_3_IRQ			28
+#define PIC_MMC_IRQ			29
+#define PIC_I2C_0_IRQ			30
+#define PIC_I2C_1_IRQ			31
 
 #ifndef __ASSEMBLY__
 

diff --git a/trunk/arch/mips/netlogic/xlp/nlm_hal.c b/trunk/arch/mips/netlogic/xlp/nlm_hal.c
@@ -89,6 +89,12 @@ int nlm_irq_to_irt(int irq)
 	       return PIC_IRT_OHCI_2_INDEX;
 	case PIC_OHCI_3_IRQ:
 	       return PIC_IRT_OHCI_3_INDEX;
+	case PIC_MMC_IRQ:
+	       return PIC_IRT_MMC_INDEX;
+	case PIC_I2C_0_IRQ:
+		return PIC_IRT_I2C_0_INDEX;
+	case PIC_I2C_1_IRQ:
+		return PIC_IRT_I2C_1_INDEX;
 	default:
 		return -1;
 	}
@@ -121,6 +127,12 @@ int nlm_irt_to_irq(int irt)
 		return PIC_OHCI_2_IRQ;
 	case PIC_IRT_OHCI_3_INDEX:
 		return PIC_OHCI_3_IRQ;
+	case PIC_IRT_MMC_INDEX:
+	       return PIC_MMC_IRQ;
+	case PIC_IRT_I2C_0_INDEX:
+		return PIC_I2C_0_IRQ;
+	case PIC_IRT_I2C_1_INDEX:
+		return PIC_I2C_1_IRQ;
 	default:
 		return -1;
 	}