diff options
| author | John Rigby <john.rigby@linaro.org> | 2011-03-04 19:22:04 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-03-16 16:06:15 -0600 |
| commit | 020d394d88fd3e9742ba6ade799fbe7abf7f0be0 (patch) | |
| tree | 9732349e465ff32f52f7b3b508c30c5160042efe | |
| parent | e617d8c7d98b088f3a298cd5d74b97590f75eaa4 (diff) | |
LINARO: Disable CONFIG_OMAP2_DSS_SDI
This allows display to work on omap4/panda.
Side effect is that panel-acx565akm module is disabled
as well because it needs DSS_SDI.
This is actually not just a workaround but the proper
fix for now. If a board has an sdi display then the
sdi requlator shoulc be enabled in sdi.c not in the
board file.
Signed-off-by: John Rigby <john.rigby@linaro.org>
| -rw-r--r-- | debian.linaro/abi/2.6.38-1000.1/modules.ignore | 1 | ||||
| -rw-r--r-- | debian.linaro/changelog | 3 | ||||
| -rw-r--r-- | debian.linaro/config/config.common.ubuntu | 7 |
3 files changed, 7 insertions, 4 deletions
diff --git a/debian.linaro/abi/2.6.38-1000.1/modules.ignore b/debian.linaro/abi/2.6.38-1000.1/modules.ignore index f47ec1304268..e5cbf9190441 100644 --- a/debian.linaro/abi/2.6.38-1000.1/modules.ignore +++ b/debian.linaro/abi/2.6.38-1000.1/modules.ignore @@ -1 +1,2 @@ sctp_probe +panel-acx565akm diff --git a/debian.linaro/changelog b/debian.linaro/changelog index bdff6dcea4ed..8cd93ebe2072 100644 --- a/debian.linaro/changelog +++ b/debian.linaro/changelog @@ -15,6 +15,9 @@ linux-linaro (2.6.38-1001.2) UNRELEASED; urgency=low linaro-linux-2.6.38-upstream-4Mar2011 ubuntu-natty master-next as of 4Mar2011 * Re-enable display on OMAP4 + * Disable CONFIG_OMAP2_DSS_SDI + - LP: #728603 + - LP: #720055 -- John Rigby <john.rigby@linaro.org> Tue, 01 Mar 2011 14:11:33 -0700 diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu index b27d3775da8f..ace9ea89f22d 100644 --- a/debian.linaro/config/config.common.ubuntu +++ b/debian.linaro/config/config.common.ubuntu @@ -1886,17 +1886,17 @@ CONFIG_OCFS2_FS_STATS=y CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m CONFIG_OLD_BELKIN_DONGLE=m CONFIG_OMAP2_DSS=y -# CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS is not set +CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS=y CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y CONFIG_OMAP2_DSS_DPI=y # CONFIG_OMAP2_DSS_DSI is not set # CONFIG_OMAP2_DSS_FAKE_VSYNC is not set CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0 # CONFIG_OMAP2_DSS_RFBI is not set -CONFIG_OMAP2_DSS_SDI=y +# CONFIG_OMAP2_DSS_SDI is not set CONFIG_OMAP2_DSS_VENC=y CONFIG_OMAP2_VRAM=y -CONFIG_OMAP2_VRAM_SIZE=6 +CONFIG_OMAP2_VRAM_SIZE=32 CONFIG_OMAP2_VRFB=y CONFIG_OMAP3_EMU=y # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set @@ -1933,7 +1933,6 @@ CONFIG_PACKET=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_PAGE_OFFSET=0xC0000000 # CONFIG_PAGE_POISONING is not set -CONFIG_PANEL_ACX565AKM=m # CONFIG_PANEL_CHANGE_MESSAGE is not set CONFIG_PANEL_GENERIC_DPI=y CONFIG_PANEL_NEC_NL8048HL11_01B=y |