| Message ID | 1355142530-10366-3-git-send-email-jhovold@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
>>>>> "Johan" == Johan Hovold <jhovold@gmail.com> writes: Johan> Fix regression introduced by commit 787f9fd23283 ("atmel_lcdfb: support Johan> 16bit BGR:565 mode, remove unsupported 15bit modes") which broke 16-bpp Johan> modes for older SOCs which use IBGR:555 (msb is intensity) rather than Johan> BGR:565. Johan> The above commit also removed the RGB:555-wiring hack without fixing the Johan> neocore926 board which used it. Fix by specifying RGB-wiring and let the Johan> driver handle the final SOC-dependant layout. Johan> Remove the no longer used ATMEL_LCDC_WIRING_RGB555 define. Acked-by: Peter Korsgaard <jacmet@sunsite.dk>
diff --git a/arch/arm/mach-at91/board-neocore926.c b/arch/arm/mach-at91/board-neocore926.c index 997d359..daeb7c6 100644 --- a/arch/arm/mach-at91/board-neocore926.c +++ b/arch/arm/mach-at91/board-neocore926.c @@ -265,7 +265,7 @@ static struct atmel_lcdfb_info __initdata neocore926_lcdc_data = { .default_monspecs = &at91fb_default_monspecs, .atmel_lcdfb_power_control = at91_lcdc_power_control, .guard_time = 1, - .lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB555, + .lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB, }; #else diff --git a/include/video/atmel_lcdc.h b/include/video/atmel_lcdc.h index 5f0e234..8deb226 100644 --- a/include/video/atmel_lcdc.h +++ b/include/video/atmel_lcdc.h @@ -30,7 +30,6 @@ */ #define ATMEL_LCDC_WIRING_BGR 0 #define ATMEL_LCDC_WIRING_RGB 1 -#define ATMEL_LCDC_WIRING_RGB555 2 /* LCD Controller info data structure, stored in device platform_data */
Fix regression introduced by commit 787f9fd23283 ("atmel_lcdfb: support 16bit BGR:565 mode, remove unsupported 15bit modes") which broke 16-bpp modes for older SOCs which use IBGR:555 (msb is intensity) rather than BGR:565. The above commit also removed the RGB:555-wiring hack without fixing the neocore926 board which used it. Fix by specifying RGB-wiring and let the driver handle the final SOC-dependant layout. Remove the no longer used ATMEL_LCDC_WIRING_RGB555 define. Compile-only tested. Cc: <stable@vger.kernel.org> Signed-off-by: Johan Hovold <jhovold@gmail.com> --- arch/arm/mach-at91/board-neocore926.c | 2 +- include/video/atmel_lcdc.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)