aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorSandeep Paulraj <s-paulraj@ti.com>2009-06-20 12:11:09 -0400
committerKevin Hilman <khilman@deeprootsystems.com>2009-08-26 03:56:58 -0400
commit9f5131538368b299aabcc790f1cece0439e65a5e (patch)
tree18ad7d8d00c3bcff8fa728f378116a7743b07e4c /arch/arm
parenta46e9e403cf930c7a09f7732bba78b38ab14f067 (diff)
davinci: dm365: add mux entries for EDMA, RTC, EMAC, keypad.
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-davinci/dm365.c13
-rw-r--r--arch/arm/mach-davinci/include/mach/mux.h5
2 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index 69d35d947767..c9ae97a476a4 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -530,6 +530,19 @@ MUX_CFG(DM365, EMAC_RX_ER, 3, 3, 1, 1, false)
530MUX_CFG(DM365, EMAC_CRS, 3, 2, 1, 1, false) 530MUX_CFG(DM365, EMAC_CRS, 3, 2, 1, 1, false)
531MUX_CFG(DM365, EMAC_MDIO, 3, 1, 1, 1, false) 531MUX_CFG(DM365, EMAC_MDIO, 3, 1, 1, 1, false)
532MUX_CFG(DM365, EMAC_MDCLK, 3, 0, 1, 1, false) 532MUX_CFG(DM365, EMAC_MDCLK, 3, 0, 1, 1, false)
533
534MUX_CFG(DM365, KEYPAD, 2, 0, 0x3f, 0x3f, false)
535
536INT_CFG(DM365, INT_EDMA_CC, 2, 1, 1, false)
537INT_CFG(DM365, INT_EDMA_TC0_ERR, 3, 1, 1, false)
538INT_CFG(DM365, INT_EDMA_TC1_ERR, 4, 1, 1, false)
539INT_CFG(DM365, INT_EDMA_TC2_ERR, 22, 1, 1, false)
540INT_CFG(DM365, INT_EDMA_TC3_ERR, 23, 1, 1, false)
541INT_CFG(DM365, INT_PRTCSS, 10, 1, 1, false)
542INT_CFG(DM365, INT_EMAC_RXTHRESH, 14, 1, 1, false)
543INT_CFG(DM365, INT_EMAC_RXPULSE, 15, 1, 1, false)
544INT_CFG(DM365, INT_EMAC_TXPULSE, 16, 1, 1, false)
545INT_CFG(DM365, INT_EMAC_MISCPULSE, 17, 1, 1, false)
533#endif 546#endif
534}; 547};
535 548
diff --git a/arch/arm/mach-davinci/include/mach/mux.h b/arch/arm/mach-davinci/include/mach/mux.h
index c182bd458d73..55765e1fdb78 100644
--- a/arch/arm/mach-davinci/include/mach/mux.h
+++ b/arch/arm/mach-davinci/include/mach/mux.h
@@ -221,10 +221,15 @@ enum davinci_dm365_index {
221 DM365_EMAC_MDIO, 221 DM365_EMAC_MDIO,
222 DM365_EMAC_MDCLK, 222 DM365_EMAC_MDCLK,
223 223
224 /* Keypad */
225 DM365_KEYPAD,
226
224 /* IRQ muxing */ 227 /* IRQ muxing */
225 DM365_INT_EDMA_CC, 228 DM365_INT_EDMA_CC,
226 DM365_INT_EDMA_TC0_ERR, 229 DM365_INT_EDMA_TC0_ERR,
227 DM365_INT_EDMA_TC1_ERR, 230 DM365_INT_EDMA_TC1_ERR,
231 DM365_INT_EDMA_TC2_ERR,
232 DM365_INT_EDMA_TC3_ERR,
228 DM365_INT_PRTCSS, 233 DM365_INT_PRTCSS,
229 DM365_INT_EMAC_RXTHRESH, 234 DM365_INT_EMAC_RXTHRESH,
230 DM365_INT_EMAC_RXPULSE, 235 DM365_INT_EMAC_RXPULSE,