aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorJayachandran C <jayachandranc@netlogicmicro.com>2012-07-24 11:28:54 -0400
committerRalf Baechle <ralf@linux-mips.org>2012-07-24 11:28:54 -0400
commit57d7cdb630716c3f9cf7beadd05059c65a9acd25 (patch)
tree9821b82bd2103333d4e605ee4d79e733234405d2 /arch/mips
parent1004165f346ac17ea8615bac26398d70c9d6689b (diff)
MIPS: Netlogic: Add IRQ mappings for more devices
Add IRT to IRQ translation for the MMC and I2C IRQs. Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/3761/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/include/asm/netlogic/xlp-hal/xlp.h3
-rw-r--r--arch/mips/netlogic/xlp/nlm_hal.c12
2 files changed, 15 insertions, 0 deletions
diff --git a/arch/mips/include/asm/netlogic/xlp-hal/xlp.h b/arch/mips/include/asm/netlogic/xlp-hal/xlp.h
index 3921a313ec4a..7e47209327a5 100644
--- a/arch/mips/include/asm/netlogic/xlp-hal/xlp.h
+++ b/arch/mips/include/asm/netlogic/xlp-hal/xlp.h
@@ -47,6 +47,9 @@
47#define PIC_OHCI_1_IRQ 26 47#define PIC_OHCI_1_IRQ 26
48#define PIC_OHCI_2_IRQ 27 48#define PIC_OHCI_2_IRQ 27
49#define PIC_OHCI_3_IRQ 28 49#define PIC_OHCI_3_IRQ 28
50#define PIC_MMC_IRQ 29
51#define PIC_I2C_0_IRQ 30
52#define PIC_I2C_1_IRQ 31
50 53
51#ifndef __ASSEMBLY__ 54#ifndef __ASSEMBLY__
52 55
diff --git a/arch/mips/netlogic/xlp/nlm_hal.c b/arch/mips/netlogic/xlp/nlm_hal.c
index fad2cae293c6..6c65ac701912 100644
--- a/arch/mips/netlogic/xlp/nlm_hal.c
+++ b/arch/mips/netlogic/xlp/nlm_hal.c
@@ -89,6 +89,12 @@ int nlm_irq_to_irt(int irq)
89 return PIC_IRT_OHCI_2_INDEX; 89 return PIC_IRT_OHCI_2_INDEX;
90 case PIC_OHCI_3_IRQ: 90 case PIC_OHCI_3_IRQ:
91 return PIC_IRT_OHCI_3_INDEX; 91 return PIC_IRT_OHCI_3_INDEX;
92 case PIC_MMC_IRQ:
93 return PIC_IRT_MMC_INDEX;
94 case PIC_I2C_0_IRQ:
95 return PIC_IRT_I2C_0_INDEX;
96 case PIC_I2C_1_IRQ:
97 return PIC_IRT_I2C_1_INDEX;
92 default: 98 default:
93 return -1; 99 return -1;
94 } 100 }
@@ -121,6 +127,12 @@ int nlm_irt_to_irq(int irt)
121 return PIC_OHCI_2_IRQ; 127 return PIC_OHCI_2_IRQ;
122 case PIC_IRT_OHCI_3_INDEX: 128 case PIC_IRT_OHCI_3_INDEX:
123 return PIC_OHCI_3_IRQ; 129 return PIC_OHCI_3_IRQ;
130 case PIC_IRT_MMC_INDEX:
131 return PIC_MMC_IRQ;
132 case PIC_IRT_I2C_0_INDEX:
133 return PIC_I2C_0_IRQ;
134 case PIC_IRT_I2C_1_INDEX:
135 return PIC_I2C_1_IRQ;
124 default: 136 default:
125 return -1; 137 return -1;
126 } 138 }