diff options
| author | John Rigby <john.rigby@linaro.org> | 2011-02-23 10:17:03 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-03-16 16:05:51 -0600 |
| commit | c8baaa6cfe5629ad808ed73d7827f6f066e3f611 (patch) | |
| tree | 7e432bb06a5718290154a43de65ae11e1f19077e | |
| parent | d14bf1d1f015920cde5261d9d3566dd245d7d3b2 (diff) | |
LINARO: WORKAROUND: Temporarily disable display on OMAP4
Signed-off-by: John Rigby <john.rigby@linaro.org>
| -rw-r--r-- | arch/arm/mach-omap2/display.c | 8 | ||||
| -rw-r--r-- | debian.linaro/changelog | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c index cc7b4f3070d6..7973c67a45cf 100644 --- a/arch/arm/mach-omap2/display.c +++ b/arch/arm/mach-omap2/display.c @@ -52,6 +52,14 @@ int __init omap_display_init(struct omap_dss_board_info struct omap_display_platform_data pdata; /* + * NB: This is temporary to have a headless panda until + * omap4 display works + */ + if (cpu_is_omap44xx()) { + printk(KERN_WARNING "Disabling OMAP display on OMAP4!!!!\n"); + return -ENODEV; + } + /* * omap: valid DSS hwmod names * omap2,3,4: dss_core, dss_dispc, dss_rfbi, dss_venc * omap3,4: dss_dsi1 diff --git a/debian.linaro/changelog b/debian.linaro/changelog index 40967140474b..98752249909f 100644 --- a/debian.linaro/changelog +++ b/debian.linaro/changelog @@ -10,6 +10,7 @@ linux-linaro (2.6.38-1000.1) UNRELEASED; urgency=low Ubuntu-2.6.38-4.31 * Enforce CONFIG_PM_ADVANCED_DEBUG for all flavours - LP: #713075 + * Temporarily disable display on OMAP4 -- John Rigby <john.rigby@linaro.org> Tue, 22 Feb 2011 12:48:52 -0700 |