From 6206b396ffb5133a86059e83ac53f0f477826fe8 Mon Sep 17 00:00:00 2001 From: John Lenz Date: Thu, 13 May 2004 16:41:47 +0100 Subject: [PATCH] [ARM PATCH] 1851/1: sa1100 fb support for collie Patch from John Lenz Add the sa1100fb_mach_info structure for collie --- drivers/video/sa1100fb.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c index ee1bf090cc4fb..b14a667dbd819 100644 --- a/drivers/video/sa1100fb.c +++ b/drivers/video/sa1100fb.c @@ -326,6 +326,22 @@ static struct sa1100fb_mach_info brutus_info __initdata = { }; #endif +#ifdef CONFIG_SA1100_COLLIE +static struct sa1100fb_mach_info collie_info __initdata = { + pixclock: 171521, bpp: 16, + xres: 320, yres: 240, + + hsync_len: 5, vsync_len: 1, + left_margin: 11, upper_margin: 2, + right_margin: 30, lower_margin: 0, + + sync: FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, + + lccr0: LCCR0_Color | LCCR0_Sngl | LCCR0_Act, + lccr3: LCCR3_OutEnH | LCCR3_PixRsEdg | LCCR3_ACBsDiv(2), +}; +#endif + #ifdef CONFIG_SA1100_FREEBIRD #warning Please check this carefully static struct sa1100fb_mach_info freebird_info __initdata = { @@ -635,6 +651,11 @@ sa1100fb_get_machine_info(struct sa1100fb_info *fbi) inf = &brutus_info; } #endif +#ifdef CONFIG_SA1100_COLLIE + if (machine_is_collie()) { + inf = &collie_info; + } +#endif #ifdef CONFIG_SA1100_FREEBIRD if (machine_is_freebird()) { inf = &freebird_info; -- 2.53.0