diff options
| author | Eric Miao <eric.miao@linaro.org> | 2011-03-28 12:48:40 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2011-03-29 12:31:27 +0800 |
| commit | c0755b49cf60cea88432621d54a0de1042627266 (patch) | |
| tree | d0e0bbef107a02d75ce79fb199d3e85dbca961ae | |
| parent | f8fbab1ae486472198196805a6eb438e761c88a9 (diff) | |
LINARO: make VGA default output for mx53loco
BugLink: http://bugs.launchpad.net/bugs/738028
Signed-off-by: Eric Miao <eric.miao@linaro.org>
| -rw-r--r-- | arch/arm/mach-mx5/mx53_loco.c | 29 | ||||
| -rw-r--r-- | drivers/video/mxc/tve.c | 12 |
2 files changed, 8 insertions, 33 deletions
diff --git a/arch/arm/mach-mx5/mx53_loco.c b/arch/arm/mach-mx5/mx53_loco.c index 87df2bcde9a8..b34be0263ea0 100644 --- a/arch/arm/mach-mx5/mx53_loco.c +++ b/arch/arm/mach-mx5/mx53_loco.c @@ -489,32 +489,19 @@ static struct mxc_fb_platform_data fb_data[] = { }, }; -extern int primary_di; static int __init mxc_init_fb(void) { if (!machine_is_mx53_loco()) return 0; - if (primary_di) { - printk(KERN_INFO "DI1 is primary\n"); - /* DI1 -> DP-BG channel: */ - mxc_fb_devices[1].num_resources = ARRAY_SIZE(mxcfb_resources); - mxc_fb_devices[1].resource = mxcfb_resources; - mxc_register_device(&mxc_fb_devices[1], &fb_data[1]); - - /* DI0 -> DC channel: */ - mxc_register_device(&mxc_fb_devices[0], &fb_data[0]); - } else { - printk(KERN_INFO "DI0 is primary\n"); - - /* DI0 -> DP-BG channel: */ - mxc_fb_devices[0].num_resources = ARRAY_SIZE(mxcfb_resources); - mxc_fb_devices[0].resource = mxcfb_resources; - mxc_register_device(&mxc_fb_devices[0], &fb_data[0]); - - /* DI1 -> DC channel: */ - mxc_register_device(&mxc_fb_devices[1], &fb_data[1]); - } + pr_info("DI1 is primary\n"); + /* DI1 -> DP-BG channel: */ + mxc_fb_devices[1].num_resources = ARRAY_SIZE(mxcfb_resources); + mxc_fb_devices[1].resource = mxcfb_resources; + mxc_register_device(&mxc_fb_devices[1], &fb_data[1]); + + /* DI0 -> DC channel: */ + mxc_register_device(&mxc_fb_devices[0], &fb_data[0]); /* * DI0/1 DP-FG channel: diff --git a/drivers/video/mxc/tve.c b/drivers/video/mxc/tve.c index e508e2d43e90..de2b0983448b 100644 --- a/drivers/video/mxc/tve.c +++ b/drivers/video/mxc/tve.c @@ -101,7 +101,6 @@ DEFINE_SPINLOCK(tve_lock); static struct fb_info *tve_fbi; static struct fb_modelist tve_modelist; -static bool g_enable_tve; struct tve_data { struct platform_device *pdev; @@ -1198,9 +1197,6 @@ static int tve_probe(struct platform_device *pdev) struct tve_platform_data *plat_data = pdev->dev.platform_data; u32 conf_reg; - if (g_enable_tve == false) - return -EPERM; - INIT_LIST_HEAD(&tve_modelist.list); res = platform_get_resource(pdev, IORESOURCE_MEM, 0); @@ -1385,14 +1381,6 @@ static struct platform_driver tve_driver = { .remove = tve_remove, }; -static int __init enable_tve_setup(char *options) -{ - g_enable_tve = true; - - return 1; -} -__setup("tve", enable_tve_setup); - static int __init tve_init(void) { return platform_driver_register(&tve_driver); |