diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-14 11:50:04 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-21 11:56:19 +0000 |
commit | e1b7a72aeb8292502c97b43eceb01aea47ded40f (patch) | |
tree | e3932a7b52a5805cfff785ca9162925e34eb3095 /arch/arm/mach-sa1100/shannon.c | |
parent | 9e6720fb0cfd6edda12b408a66f4ac88e8a82e32 (diff) | |
download | blackbird-obmc-linux-e1b7a72aeb8292502c97b43eceb01aea47ded40f.tar.gz blackbird-obmc-linux-e1b7a72aeb8292502c97b43eceb01aea47ded40f.zip |
FB: sa1100: move platform data to platform files
Move platform data out of the sa1100fb driver into the various
platform files themselves.
Acked-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100/shannon.c')
-rw-r--r-- | arch/arm/mach-sa1100/shannon.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/shannon.c b/arch/arm/mach-sa1100/shannon.c index 318b2b766a0b..c695b730bd69 100644 --- a/arch/arm/mach-sa1100/shannon.c +++ b/arch/arm/mach-sa1100/shannon.c @@ -9,6 +9,8 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <video/sa1100fb.h> + #include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/setup.h> @@ -57,8 +59,23 @@ static struct mcp_plat_data shannon_mcp_data = { .sclk_rate = 11981000, }; +static struct sa1100fb_mach_info shannon_lcd_info = { + .pixclock = 152500, .bpp = 8, + .xres = 640, .yres = 480, + + .hsync_len = 4, .vsync_len = 3, + .left_margin = 2, .upper_margin = 0, + .right_margin = 1, .lower_margin = 0, + + .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, + + .lccr0 = LCCR0_Color | LCCR0_Dual | LCCR0_Pas, + .lccr3 = LCCR3_ACBsDiv(512), +}; + static void __init shannon_init(void) { + sa11x0_register_lcd(&shannon_lcd_info); sa11x0_register_mtd(&shannon_flash_data, &shannon_flash_resource, 1); sa11x0_register_mcp(&shannon_mcp_data); } |