summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-14 16:21:18 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-02-21 15:56:20 +0400
commitd1a378876c2ab3ea119eea502e8d48e25ef253e4 (patch)
tree8d07ff459a9d675eeb3d8402eb3598c8b8404e79
parent086ada54abaa4316e8603f02410fe8ebc9ba2de1 (diff)
downloadlinux-d1a378876c2ab3ea119eea502e8d48e25ef253e4.tar.xz
FB: sa1100: remove assabet specific initialization
Remove the assabet specific initialization for PAL output mode - we call the lcd_power function before we enable the LCD controller, which will disable the LCD panel to prevent it receiving incorrect timings. Therefore, this setup here is redundant. Acked-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--drivers/video/sa1100fb.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index c9f1e7cd95f8..f6e27f4da1d8 100644
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@@ -182,7 +182,6 @@
#include <mach/hardware.h>
#include <asm/mach-types.h>
-#include <mach/assabet.h>
#include <mach/shannon.h>
/*
@@ -190,8 +189,6 @@
*/
#define DEBUG_VAR 1
-#undef ASSABET_PAL_VIDEO
-
#include "sa1100fb.h"
static const struct sa1100fb_rgb rgb_4 = {
@@ -1229,11 +1226,6 @@ static int __devinit sa1100fb_probe(struct platform_device *pdev)
goto failed;
}
-#ifdef ASSABET_PAL_VIDEO
- if (machine_is_assabet())
- ASSABET_BCR_clear(ASSABET_BCR_LCD_ON);
-#endif
-
/*
* This makes sure that our colour bitfield
* descriptors are correctly initialised.