summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2014-01-27 14:17:44 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2014-01-27 14:17:44 +0100
commita70cceafb0baaf88bb19b74a521705ccab1f53b3 (patch)
tree39e0c53de93527a31cbe9ad75b13bff6a310a8ea
parent9c16e834ca41a069b4b6bdbd471bb8da6eb96373 (diff)
pinmuxing: VGA on second IPU
-rw-r--r--arch/arm/mach-mx6/pads-apalis_imx6.h23
1 files changed, 23 insertions, 0 deletions
diff --git a/arch/arm/mach-mx6/pads-apalis_imx6.h b/arch/arm/mach-mx6/pads-apalis_imx6.h
index 13f2a10ff8ce..ded5f4d143b0 100644
--- a/arch/arm/mach-mx6/pads-apalis_imx6.h
+++ b/arch/arm/mach-mx6/pads-apalis_imx6.h
@@ -385,6 +385,7 @@ static iomux_v3_cfg_t MX6NAME(lcd_pads_disable)[] = {
/* Apalis MXM VGA DAC */
static iomux_v3_cfg_t MX6NAME(vga_dac_enable)[] = {
+#ifdef FOR_DL_SOLO /* do not have IPU2 */
MX6PAD(DI0_DISP_CLK__IPU1_DI0_DISP_CLK),
MX6PAD(DI0_PIN2__IPU1_DI0_PIN2), /* HSync */
MX6PAD(DI0_PIN3__IPU1_DI0_PIN3), /* VSync */
@@ -404,7 +405,29 @@ static iomux_v3_cfg_t MX6NAME(vga_dac_enable)[] = {
MX6PAD(DISP0_DAT13__IPU1_DISP0_DAT_13),
MX6PAD(DISP0_DAT14__IPU1_DISP0_DAT_14),
MX6PAD(DISP0_DAT15__IPU1_DISP0_DAT_15),
+ 0,
+#else
+ MX6PAD(DI0_DISP_CLK__IPU2_DI0_DISP_CLK),
+ MX6PAD(DI0_PIN2__IPU2_DI0_PIN2), /* HSync */
+ MX6PAD(DI0_PIN3__IPU2_DI0_PIN3), /* VSync */
+ MX6PAD(DISP0_DAT0__IPU2_DISP0_DAT_0),
+ MX6PAD(DISP0_DAT1__IPU2_DISP0_DAT_1),
+ MX6PAD(DISP0_DAT2__IPU2_DISP0_DAT_2),
+ MX6PAD(DISP0_DAT3__IPU2_DISP0_DAT_3),
+ MX6PAD(DISP0_DAT4__IPU2_DISP0_DAT_4),
+ MX6PAD(DISP0_DAT5__IPU2_DISP0_DAT_5),
+ MX6PAD(DISP0_DAT6__IPU2_DISP0_DAT_6),
+ MX6PAD(DISP0_DAT7__IPU2_DISP0_DAT_7),
+ MX6PAD(DISP0_DAT8__IPU2_DISP0_DAT_8),
+ MX6PAD(DISP0_DAT9__IPU2_DISP0_DAT_9),
+ MX6PAD(DISP0_DAT10__IPU2_DISP0_DAT_10),
+ MX6PAD(DISP0_DAT11__IPU2_DISP0_DAT_11),
+ MX6PAD(DISP0_DAT12__IPU2_DISP0_DAT_12),
+ MX6PAD(DISP0_DAT13__IPU2_DISP0_DAT_13),
+ MX6PAD(DISP0_DAT14__IPU2_DISP0_DAT_14),
+ MX6PAD(DISP0_DAT15__IPU2_DISP0_DAT_15),
0
+#endif
};
static iomux_v3_cfg_t MX6NAME(vga_dac_disable)[] = {