2 files changed, 109 insertions, 0 deletions

diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index c52aad300844..e5873bc0a0fa 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -533,6 +533,57 @@ MUX_CFG(DM365,  EMAC_MDCLK,	3,   0,     1,    1,     false)
 
 MUX_CFG(DM365,  KEYPAD,         2,   0,     0x3f, 0x3f,  false)
 
+MUX_CFG(DM365,  PWM0,           1,   0,     3,    2,     false)
+MUX_CFG(DM365,  PWM0_G23,       3,   26,    3,    3,     false)
+MUX_CFG(DM365,  PWM1,           1,   2,     3,    2,     false)
+MUX_CFG(DM365,  PWM1_G25,       3,   29,    3,    2,     false)
+MUX_CFG(DM365,  PWM2_G87,       1,   10,    3,    2,     false)
+MUX_CFG(DM365,  PWM2_G88,       1,   8,     3,    2,     false)
+MUX_CFG(DM365,  PWM2_G89,       1,   6,     3,    2,     false)
+MUX_CFG(DM365,  PWM2_G90,       1,   4,     3,    2,     false)
+MUX_CFG(DM365,  PWM3_G80,       1,   20,    3,    3,     false)
+MUX_CFG(DM365,  PWM3_G81,       1,   18,    3,    3,     false)
+MUX_CFG(DM365,  PWM3_G85,       1,   14,    3,    2,     false)
+MUX_CFG(DM365,  PWM3_G86,       1,   12,    3,    2,     false)
+
+MUX_CFG(DM365,  SPI1_SCLK,      4,   2,     3,    1,     false)
+MUX_CFG(DM365,  SPI1_SDI,       3,   31,    1,    1,     false)
+MUX_CFG(DM365,  SPI1_SDO,       4,   0,     3,    1,     false)
+MUX_CFG(DM365,  SPI1_SDENA0,    4,   4,     3,    1,     false)
+MUX_CFG(DM365,  SPI1_SDENA1,    4,   0,     3,    2,     false)
+
+MUX_CFG(DM365,  SPI2_SCLK,      4,   10,    3,    1,     false)
+MUX_CFG(DM365,  SPI2_SDI,       4,   6,     3,    1,     false)
+MUX_CFG(DM365,  SPI2_SDO,       4,   8,     3,    1,     false)
+MUX_CFG(DM365,  SPI2_SDENA0,    4,   12,    3,    1,     false)
+MUX_CFG(DM365,  SPI2_SDENA1,    4,   8,     3,    2,     false)
+
+MUX_CFG(DM365,  SPI3_SCLK,      0,   0,     3,    2,     false)
+MUX_CFG(DM365,  SPI3_SDI,       0,   2,     3,    2,     false)
+MUX_CFG(DM365,  SPI3_SDO,       0,   6,     3,    2,     false)
+MUX_CFG(DM365,  SPI3_SDENA0,    0,   4,     3,    2,     false)
+MUX_CFG(DM365,  SPI3_SDENA1,    0,   6,     3,    3,     false)
+
+MUX_CFG(DM365,  SPI4_SCLK,      4,   18,    3,    1,     false)
+MUX_CFG(DM365,  SPI4_SDI,       4,   14,    3,    1,     false)
+MUX_CFG(DM365,  SPI4_SDO,       4,   16,    3,    1,     false)
+MUX_CFG(DM365,  SPI4_SDENA0,    4,   20,    3,    1,     false)
+MUX_CFG(DM365,  SPI4_SDENA1,    4,   16,    3,    2,     false)
+
+MUX_CFG(DM365,  GPIO20,         3,   21,    3,    0,     false)
+MUX_CFG(DM365,  GPIO33,         4,   12,    3,    0,     false)
+MUX_CFG(DM365,  GPIO40,         4,   26,    3,    0,     false)
+
+MUX_CFG(DM365,  VOUT_FIELD,     1,   18,    3,    1,     false)
+MUX_CFG(DM365,  VOUT_FIELD_G81, 1,   18,    3,    0,     false)
+MUX_CFG(DM365,  VOUT_HVSYNC,    1,   16,    1,    0,     false)
+MUX_CFG(DM365,  VOUT_COUTL_EN,  1,   0,     0xff, 0x55,  false)
+MUX_CFG(DM365,  VOUT_COUTH_EN,  1,   8,     0xff, 0x55,  false)
+MUX_CFG(DM365,  VIN_CAM_WEN,    0,   14,    3,    0,     false)
+MUX_CFG(DM365,  VIN_CAM_VD,     0,   13,    1,    0,     false)
+MUX_CFG(DM365,  VIN_CAM_HD,     0,   12,    1,    0,     false)
+MUX_CFG(DM365,  VIN_YIN_EN,     0,   0,     0xfff, 0,    false)
+
 INT_CFG(DM365,  INT_EDMA_CC,         2,     1,    1,     false)
 INT_CFG(DM365,  INT_EDMA_TC0_ERR,    3,     1,    1,     false)
 INT_CFG(DM365,  INT_EDMA_TC1_ERR,    4,     1,    1,     false)
diff --git a/arch/arm/mach-davinci/include/mach/mux.h b/arch/arm/mach-davinci/include/mach/mux.h
index ae4f6dd3623c..cce7509ea302 100644
--- a/arch/arm/mach-davinci/include/mach/mux.h
+++ b/arch/arm/mach-davinci/include/mach/mux.h
@@ -224,6 +224,64 @@ enum davinci_dm365_index {
         /* Keypad */
         DM365_KEYPAD,
 
+        /* PWM */
+        DM365_PWM0,
+        DM365_PWM0_G23,
+        DM365_PWM1,
+        DM365_PWM1_G25,
+        DM365_PWM2_G87,
+        DM365_PWM2_G88,
+        DM365_PWM2_G89,
+        DM365_PWM2_G90,
+        DM365_PWM3_G80,
+        DM365_PWM3_G81,
+        DM365_PWM3_G85,
+        DM365_PWM3_G86,
+
+        /* SPI1 */
+        DM365_SPI1_SCLK,
+        DM365_SPI1_SDO,
+        DM365_SPI1_SDI,
+        DM365_SPI1_SDENA0,
+        DM365_SPI1_SDENA1,
+
+        /* SPI2 */
+        DM365_SPI2_SCLK,
+        DM365_SPI2_SDO,
+        DM365_SPI2_SDI,
+        DM365_SPI2_SDENA0,
+        DM365_SPI2_SDENA1,
+
+        /* SPI3 */
+        DM365_SPI3_SCLK,
+        DM365_SPI3_SDO,
+        DM365_SPI3_SDI,
+        DM365_SPI3_SDENA0,
+        DM365_SPI3_SDENA1,
+
+        /* SPI4 */
+        DM365_SPI4_SCLK,
+        DM365_SPI4_SDO,
+        DM365_SPI4_SDI,
+        DM365_SPI4_SDENA0,
+        DM365_SPI4_SDENA1,
+
+        /* GPIO */
+        DM365_GPIO20,
+        DM365_GPIO33,
+        DM365_GPIO40,
+
+        /* Video */
+        DM365_VOUT_FIELD,
+        DM365_VOUT_FIELD_G81,
+        DM365_VOUT_HVSYNC,
+        DM365_VOUT_COUTL_EN,
+        DM365_VOUT_COUTH_EN,
+        DM365_VIN_CAM_WEN,
+        DM365_VIN_CAM_VD,
+        DM365_VIN_CAM_HD,
+        DM365_VIN_YIN_EN,
+
         /* IRQ muxing */
         DM365_INT_EDMA_CC,
         DM365_INT_EDMA_TC0_ERR,