Merge omapzoom-changes into drivers/video/omap2/dss/dispc.c

This merges omapzoom-changes which were lost during the merge of
the motorola-patch back into dispc.c and fixes the panel not
resuming on rare occasions.

Change-Id: If70e11c8a39e5dab4a91af3bbc9e209deeac0348
OMAP4: ST: Disabling UART if ldisc not installed.

OMAP4: ST: Disabling UART if ldisc not installed.

In cases when there is no line discipline to be installed UART chip must be
disabled.

Rationale: if ldisc is not installed so it can't be uninstalled.
Thus UART chip still enabled and we have wakelock for it
(see plat_uart_enable() function in both blaze and 44xx-tablet board files).
In that case we can't go in suspend mode.

Motivation: when using busybox ramdisk (e.g. for testing kernel w/o AFS) we
have no ldisc that causes impossibility to go to suspend mode.

Change-Id: I6fac0b9411ed765e8e598328b89a41a50b5fbfea
Signed-off-by: Semen Protsenko <semen.protsenko@ti.com>
Revert "omap4-common: release st_wake_lock after 5s"

This reverts commit 76caf5b3c0a2904149615d6ca1db0355fa0e79df.

The real fix for the st_wake_lock is contained in the commit
"OMAP4: ST: Disabling UART if ldisc not installed.", which also
allows the L4 powerdomain to go to sleep.

Change-Id: Idba5f9a83c83c880aeed91ebcdc72fe0d319189d
Merge branch 'cm-11.0' into martincz