aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-davinci')
-rw-r--r--arch/arm/mach-davinci/dm365.c3
-rw-r--r--arch/arm/mach-davinci/include/mach/mux.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index aa3b0bbdda73..0a33e128f3f7 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -582,7 +582,8 @@ MUX_CFG(DM365, VOUT_COUTH_EN, 1, 8, 0xff, 0x55, false)
582MUX_CFG(DM365, VIN_CAM_WEN, 0, 14, 3, 0, false) 582MUX_CFG(DM365, VIN_CAM_WEN, 0, 14, 3, 0, false)
583MUX_CFG(DM365, VIN_CAM_VD, 0, 13, 1, 0, false) 583MUX_CFG(DM365, VIN_CAM_VD, 0, 13, 1, 0, false)
584MUX_CFG(DM365, VIN_CAM_HD, 0, 12, 1, 0, false) 584MUX_CFG(DM365, VIN_CAM_HD, 0, 12, 1, 0, false)
585MUX_CFG(DM365, VIN_YIN_EN, 0, 0, 0xfff, 0, false) 585MUX_CFG(DM365, VIN_YIN4_7_EN, 0, 0, 0xff, 0, false)
586MUX_CFG(DM365, VIN_YIN0_3_EN, 0, 8, 0xf, 0, false)
586 587
587INT_CFG(DM365, INT_EDMA_CC, 2, 1, 1, false) 588INT_CFG(DM365, INT_EDMA_CC, 2, 1, 1, false)
588INT_CFG(DM365, INT_EDMA_TC0_ERR, 3, 1, 1, false) 589INT_CFG(DM365, INT_EDMA_TC0_ERR, 3, 1, 1, false)
diff --git a/arch/arm/mach-davinci/include/mach/mux.h b/arch/arm/mach-davinci/include/mach/mux.h
index 368fca69197d..a676b2f47aab 100644
--- a/arch/arm/mach-davinci/include/mach/mux.h
+++ b/arch/arm/mach-davinci/include/mach/mux.h
@@ -280,7 +280,8 @@ enum davinci_dm365_index {
280 DM365_VIN_CAM_WEN, 280 DM365_VIN_CAM_WEN,
281 DM365_VIN_CAM_VD, 281 DM365_VIN_CAM_VD,
282 DM365_VIN_CAM_HD, 282 DM365_VIN_CAM_HD,
283 DM365_VIN_YIN_EN, 283 DM365_VIN_YIN4_7_EN,
284 DM365_VIN_YIN0_3_EN,
284 285
285 /* IRQ muxing */ 286 /* IRQ muxing */
286 DM365_INT_EDMA_CC, 287 DM365_INT_EDMA_CC,