diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-14 07:21:18 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-21 06:56:20 -0500 |
commit | d1a378876c2ab3ea119eea502e8d48e25ef253e4 (patch) | |
tree | 8d07ff459a9d675eeb3d8402eb3598c8b8404e79 /drivers/video | |
parent | 086ada54abaa4316e8603f02410fe8ebc9ba2de1 (diff) |
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>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/sa1100fb.c | 8 |
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 @@ | |||
182 | 182 | ||
183 | #include <mach/hardware.h> | 183 | #include <mach/hardware.h> |
184 | #include <asm/mach-types.h> | 184 | #include <asm/mach-types.h> |
185 | #include <mach/assabet.h> | ||
186 | #include <mach/shannon.h> | 185 | #include <mach/shannon.h> |
187 | 186 | ||
188 | /* | 187 | /* |
@@ -190,8 +189,6 @@ | |||
190 | */ | 189 | */ |
191 | #define DEBUG_VAR 1 | 190 | #define DEBUG_VAR 1 |
192 | 191 | ||
193 | #undef ASSABET_PAL_VIDEO | ||
194 | |||
195 | #include "sa1100fb.h" | 192 | #include "sa1100fb.h" |
196 | 193 | ||
197 | static const struct sa1100fb_rgb rgb_4 = { | 194 | static const struct sa1100fb_rgb rgb_4 = { |
@@ -1229,11 +1226,6 @@ static int __devinit sa1100fb_probe(struct platform_device *pdev) | |||
1229 | goto failed; | 1226 | goto failed; |
1230 | } | 1227 | } |
1231 | 1228 | ||
1232 | #ifdef ASSABET_PAL_VIDEO | ||
1233 | if (machine_is_assabet()) | ||
1234 | ASSABET_BCR_clear(ASSABET_BCR_LCD_ON); | ||
1235 | #endif | ||
1236 | |||
1237 | /* | 1229 | /* |
1238 | * This makes sure that our colour bitfield | 1230 | * This makes sure that our colour bitfield |
1239 | * descriptors are correctly initialised. | 1231 | * descriptors are correctly initialised. |