diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-25 23:55:54 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-25 23:55:54 +0100 |
commit | 18bbff9f679cd470db66402fdb9c577b34324183 (patch) | |
tree | f8e90adadfde630368034268de8cc5763898ab37 /arch/arm/mach-sa1100/collie.c | |
parent | e7d863d0f42e2cf19a13c867bfcab7424388bff8 (diff) | |
parent | 7cb66dcc828662c8cacb74af08478433cef102b1 (diff) | |
download | linux-18bbff9f679cd470db66402fdb9c577b34324183.tar.gz linux-18bbff9f679cd470db66402fdb9c577b34324183.tar.bz2 linux-18bbff9f679cd470db66402fdb9c577b34324183.zip |
Merge branch 'sa11x0-lcd' into sa11x0
Conflicts:
arch/arm/mach-sa1100/assabet.c
Diffstat (limited to 'arch/arm/mach-sa1100/collie.c')
-rw-r--r-- | arch/arm/mach-sa1100/collie.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c index dbe5cf719f7e..841041e11815 100644 --- a/arch/arm/mach-sa1100/collie.c +++ b/arch/arm/mach-sa1100/collie.c @@ -28,6 +28,8 @@ #include <linux/gpio.h> #include <linux/pda_power.h> +#include <video/sa1100fb.h> + #include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/irq.h> @@ -294,6 +296,20 @@ static struct resource collie_flash_resources[] = { DEFINE_RES_MEM(SA1100_CS0_PHYS, SZ_32M), }; +static struct sa1100fb_mach_info collie_lcd_info = { + .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), +}; + static void __init collie_init(void) { int ret = 0; @@ -332,6 +348,7 @@ static void __init collie_init(void) printk(KERN_WARNING "collie: Unable to register LoCoMo device\n"); } + sa11x0_register_lcd(&collie_lcd_info); sa11x0_register_mtd(&collie_flash_data, collie_flash_resources, ARRAY_SIZE(collie_flash_resources)); sa11x0_register_mcp(&collie_mcp_data); |