summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Lee <jack.lee@freescale.com>2012-10-30 12:33:41 +0800
committerJack Lee <jack.lee@freescale.com>2012-10-30 13:22:36 +0800
commit53040e6f2d79df5aca376e195b2b0b32f2957f70 (patch)
tree16e67eafd6c84953381883ba072caf9e14d1bb41
parentaaf9d00bf48472e7c21705665beb48169947e6a9 (diff)
ENGR00231574 Revert "EPDC: MX6: Adjust number of LUTs for 5-bit waveform"imx-android-13.5.0-ga
This reverts commit b8c142d2e7cfc27b98990d39305b52d2208cb36e. The changes in ENGR00229290 will cause incorrect update on Eink. Signed-off-by: Jack Lee <jack.lee@freescale.com>
-rw-r--r--drivers/video/mxc/mxc_epdc_fb.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/video/mxc/mxc_epdc_fb.c b/drivers/video/mxc/mxc_epdc_fb.c
index 2df44041e65c..95f15c96bed7 100644
--- a/drivers/video/mxc/mxc_epdc_fb.c
+++ b/drivers/video/mxc/mxc_epdc_fb.c
@@ -735,24 +735,18 @@ static int epdc_choose_next_lut(int rev, int *next_lut)
{
u64 luts_status, unprocessed_luts;
bool next_lut_found = false;
- /* Available LUTs are reduced to 16 in 5-bit waveform mode */
- u32 format_p5n = __raw_readl(EPDC_FORMAT) &
- EPDC_FORMAT_BUF_PIXEL_FORMAT_P5N;
luts_status = __raw_readl(EPDC_STATUS_LUTS);
- if ((rev < 20) || format_p5n)
+ if (rev < 20)
luts_status &= 0xFFFF;
else
luts_status |= ((u64)__raw_readl(EPDC_STATUS_LUTS2) << 32);
- if (rev < 20) {
+ if (rev < 20)
unprocessed_luts = __raw_readl(EPDC_IRQ) & 0xFFFF;
- } else {
+ else
unprocessed_luts = __raw_readl(EPDC_IRQ1) |
((u64)__raw_readl(EPDC_IRQ2) << 32);
- if (format_p5n)
- unprocessed_luts &= 0xFFFF;
- }
while (!next_lut_found) {
/*
@@ -768,7 +762,7 @@ static int epdc_choose_next_lut(int rev, int *next_lut)
*/
*next_lut = fls64(luts_status);
- if ((rev < 20) || format_p5n) {
+ if (rev < 20) {
if (*next_lut > 15)
*next_lut = ffz(luts_status);
} else {