Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight

[sfrench/cifs-2.6.git] / arch / arm / mach-davinci / include / mach / mux.h

diff --git a/arch/arm/mach-davinci/include/mach/mux.h b/arch/arm/mach-davinci/include/mach/mux.h
index 7fad9b1a106b5211c5cb28266f00907c540ca085..bb84893a4e838695dbc5c15cc63ddd4b5b42f6cb 100644 (file)
--- a/arch/arm/mach-davinci/include/mach/mux.h
+++ b/arch/arm/mach-davinci/include/mach/mux.h
@@ -161,6 +161,15 @@ enum davinci_dm355_index {
        DM355_VOUT_HVSYNC,
        DM355_VOUT_COUTL_EN,
        DM355_VOUT_COUTH_EN,
+
+       /* Video In Pin Mux */
+       DM355_VIN_PCLK,
+       DM355_VIN_CAM_WEN,
+       DM355_VIN_CAM_VD,
+       DM355_VIN_CAM_HD,
+       DM355_VIN_YIN_EN,
+       DM355_VIN_CINL_EN,
+       DM355_VIN_CINH_EN,
 };
 
 enum davinci_dm365_index {
@@ -301,6 +310,14 @@ enum davinci_dm365_index {
        DM365_INT_EMAC_RXPULSE,
        DM365_INT_EMAC_TXPULSE,
        DM365_INT_EMAC_MISCPULSE,
+       DM365_INT_IMX0_ENABLE,
+       DM365_INT_IMX0_DISABLE,
+       DM365_INT_HDVICP_ENABLE,
+       DM365_INT_HDVICP_DISABLE,
+       DM365_INT_IMX1_ENABLE,
+       DM365_INT_IMX1_DISABLE,
+       DM365_INT_NSF_ENABLE,
+       DM365_INT_NSF_DISABLE,
 
        /* EDMA event muxing */
        DM365_EVT2_ASP_TX,