3 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/devices/platform-imx-uart.c b/arch/arm/plat-mxc/devices/platform-imx-uart.c
index 3c9010784cda..fc356e031f30 100644
--- a/arch/arm/plat-mxc/devices/platform-imx-uart.c
+++ b/arch/arm/plat-mxc/devices/platform-imx-uart.c
@@ -144,6 +144,8 @@ const struct imx_imx_uart_1irq_data mvf_imx_uart_data[] __initconst = {
 	mvf_imx_uart_data_entry(1, 1),
 	mvf_imx_uart_data_entry(2, 2),
 	mvf_imx_uart_data_entry(3, 3),
+	mvf_imx_uart_data_entry(4, 4),
+	mvf_imx_uart_data_entry(5, 5),
 };
 #endif /* ifdef CONFIG_SOC_MVFA5 */
 
diff --git a/arch/arm/plat-mxc/devices/platform-mvf-adc.c b/arch/arm/plat-mxc/devices/platform-mvf-adc.c
index 38add8b5fd4f..085bc4508a31 100644
--- a/arch/arm/plat-mxc/devices/platform-mvf-adc.c
+++ b/arch/arm/plat-mxc/devices/platform-mvf-adc.c
@@ -25,7 +25,8 @@
 
 #ifdef CONFIG_SOC_MVFA5
 const struct mvf_adc_data mvfa5_adc_data[] __initconst = {
-	 mvf_adc_data_entry(MVF, 0, SZ_4K),
+	mvf_adc_data_entry(MVF, 0, SZ_4K),
+	mvf_adc_data_entry(MVF, 1, SZ_4K),
 };
 #endif
 
@@ -48,3 +49,4 @@ struct platform_device *__init mvf_add_adcdev(
 	return imx_add_platform_device("mvf-adc", data->id, res,
 			ARRAY_SIZE(res), NULL, 0);
 }
+
diff --git a/arch/arm/plat-mxc/devices/platform-mvf-dcu.c b/arch/arm/plat-mxc/devices/platform-mvf-dcu.c
index 0fe5099eca34..cba3d2552132 100644
--- a/arch/arm/plat-mxc/devices/platform-mvf-dcu.c
+++ b/arch/arm/plat-mxc/devices/platform-mvf-dcu.c
@@ -26,12 +26,14 @@ int __init mvf_dcu_init(int id)
 {
 	int ret = 0;
 
+#if !defined(CONFIG_COLIBRI_VF)
 	ret = gpio_request_one(DCU_LCD_ENABLE_PIN, GPIOF_OUT_INIT_LOW, "DCU");
 	if (ret)
 		printk(KERN_ERR "DCU: failed to request GPIO 30\n");
 
 	msleep(2);
 	gpio_set_value(DCU_LCD_ENABLE_PIN, 1);
+#endif
 
 	writel(0x20000000, MVF_IO_ADDRESS(MVF_TCON0_BASE_ADDR));
 	return ret;