summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWayne Zou <b36644@freescale.com>2013-03-08 15:29:49 +0800
committerWayne Zou <b36644@freescale.com>2013-03-12 10:13:11 +0800
commitb0c63a637e10f21435214566061d346c2e6de825 (patch)
tree34afec0fd8f7fcfe8e49301e233e100112f72c4d
parent8c06604f1845028790e5da4474e4907b5f4b7504 (diff)
ENGR00253418 IMX6 SabreSD Display: Support LVDS1 and HDMI dual display
Support LVDS1 and HDMI dual display on SabreSD Rev.C board on i.mx6 By default, LVDS uses LDB_SEP1 mode due to the hardware design. Signed-off-by: Wayne Zou <b36644@freescale.com>
-rw-r--r--arch/arm/mach-mx6/board-mx6q_sabresd.c23
1 files changed, 3 insertions, 20 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_sabresd.c b/arch/arm/mach-mx6/board-mx6q_sabresd.c
index 8cbf7fb47611..a7edf4c6f3ad 100644
--- a/arch/arm/mach-mx6/board-mx6q_sabresd.c
+++ b/arch/arm/mach-mx6/board-mx6q_sabresd.c
@@ -203,7 +203,6 @@ static struct clk *clko;
static int mma8451_position = 1;
static int mag3110_position = 2;
static int max11801_mode = 1;
-static int enable_lcd_ldb;
static int caam_enabled;
extern char *gp_reg_id;
@@ -1364,11 +1363,11 @@ static struct fsl_mxc_lcd_platform_data lcdif_data = {
static struct fsl_mxc_ldb_platform_data ldb_data = {
.ipu_id = 1,
- .disp_id = 0,
+ .disp_id = 1,
.ext_ref = 1,
- .mode = LDB_SEP0,
+ .mode = LDB_SEP1,
.sec_ipu_id = 1,
- .sec_disp_id = 1,
+ .sec_disp_id = 0,
};
static struct max8903_pdata charger1_data = {
@@ -1680,13 +1679,6 @@ static const struct imx_pcie_platform_data mx6_sabresd_pcie_data __initconst = {
.pcie_dis = SABRESD_PCIE_DIS_B,
};
-static int __init early_enable_lcd_ldb(char *p)
-{
- enable_lcd_ldb = 1;
- return 0;
-}
-early_param("enable_lcd_ldb", early_enable_lcd_ldb);
-
/*!
* Board specific initialization.
*/
@@ -1728,16 +1720,7 @@ static void __init mx6_sabresd_board_init(void)
*/
if (cpu_is_mx6dl()) {
ldb_data.ipu_id = 0;
- ldb_data.disp_id = 0;
ldb_data.sec_ipu_id = 0;
- ldb_data.sec_disp_id = 1;
- hdmi_core_data.disp_id = 1;
- mipi_dsi_pdata.ipu_id = 0;
- mipi_dsi_pdata.disp_id = 1;
- if (enable_lcd_ldb) {
- ldb_data.disp_id = 1;
- ldb_data.mode = LDB_SIN1;
- }
}
imx6q_add_mxc_hdmi_core(&hdmi_core_data);