aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-mx5
diff options
context:
space:
mode:
authorEric Miao <eric.miao@linaro.org>2011-03-28 12:48:40 +0800
committerEric Miao <eric.miao@linaro.org>2011-03-29 12:31:27 +0800
commitc0755b49cf60cea88432621d54a0de1042627266 (patch)
treed0e0bbef107a02d75ce79fb199d3e85dbca961ae /arch/arm/mach-mx5
parentf8fbab1ae486472198196805a6eb438e761c88a9 (diff)
LINARO: make VGA default output for mx53loco
BugLink: http://bugs.launchpad.net/bugs/738028 Signed-off-by: Eric Miao <eric.miao@linaro.org>
Diffstat (limited to 'arch/arm/mach-mx5')
-rw-r--r--arch/arm/mach-mx5/mx53_loco.c29
1 files changed, 8 insertions, 21 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: