aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-ux500/board-mop500-mcde.c7
-rwxr-xr-xarch/arm/mach-ux500/board-mop500.c6
2 files changed, 10 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-mcde.c b/arch/arm/mach-ux500/board-mop500-mcde.c
index ef1a7274161..eb13cbf9a5e 100644
--- a/arch/arm/mach-ux500/board-mop500-mcde.c
+++ b/arch/arm/mach-ux500/board-mop500-mcde.c
@@ -61,6 +61,7 @@ static struct mcde_port port0 = {
.virt_id = 0,
.num_data_lanes = 2,
.ui = DSI_UNIT_INTERVAL_0,
+ .clk_cont = false,
},
},
};
@@ -112,6 +113,7 @@ static struct mcde_port subdisplay_port = {
.virt_id = 0,
.num_data_lanes = 2,
.ui = DSI_UNIT_INTERVAL_1,
+ .clk_cont = false,
},
},
@@ -277,17 +279,18 @@ static struct mcde_port port2 = {
.pixel_format = MCDE_PORTPIXFMT_DSI_24BPP,
.ifc = 1,
.link = 2,
-#ifdef AV8100_HW_TE_I2SDAT3
+#ifdef CONFIG_AV8100_HWTRIG_I2SDAT3
.sync_src = MCDE_SYNCSRC_TE1,
#else
.sync_src = MCDE_SYNCSRC_TE0,
-#endif /* AV8100_HW_TE_I2SDAT3 */
+#endif /* CONFIG_AV8100_HWTRIG_I2SDAT3 */
.update_auto_trig = true,
.phy = {
.dsi = {
.virt_id = 0,
.num_data_lanes = 2,
.ui = DSI_UNIT_INTERVAL_2,
+ .clk_cont = false,
},
},
};
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 18fb1f853cf..ce173ed335e 100755
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -49,7 +49,6 @@ int href_v1_board;
#define MOP500_PLATFORM_ID 0
#define HREF_PLATFORM_ID 1
-/*#define AV8100_HW_TE_I2SDAT3*/ /* REVIEW/TODO: remove? */
int platform_id = MOP500_PLATFORM_ID;
/* we have equally similar boards with very minimal
@@ -113,8 +112,13 @@ static struct gpio_altfun_data gpio_altfun_table[] = {
"mcde tvout"),
__GPIO_ALT(GPIO_ALT_LCD_PANELB, 150, 150, 0, NMK_GPIO_ALT_B,
"mcde tvout"),
+#ifdef CONFIG_AV8100_HWTRIG_I2SDAT3
+ __GPIO_ALT(GPIO_ALT_LCD_PANELA, 69, 69, 0, NMK_GPIO_ALT_A,
+ "mcde tvout"),
+#else
__GPIO_ALT(GPIO_ALT_LCD_PANELA, 68, 68, 0, NMK_GPIO_ALT_A,
"mcde tvout"),
+#endif /* CONFIG_AV8100_HWTRIG_I2SDAT3 */
__GPIO_ALT(GPIO_ALT_MMIO_INIT_BOARD, 141, 142, 0, NMK_GPIO_ALT_B,
"mmio"),
__GPIO_ALT(GPIO_ALT_MMIO_CAM_SET_I2C, 8, 9, 0, NMK_GPIO_ALT_A, "mmio"),