aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-versatile
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@stericsson.com>2010-07-17 07:34:25 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-07-18 15:44:16 -0400
commitd161edfbf20597752e315e60e31026393680485a (patch)
tree7b08379ff9d5631d4109b2cec7c24a4bcc06a155 /arch/arm/mach-versatile
parentef6f4b129bbbade7d06b0a9307b605cc78ca4b3b (diff)
ARM: 6215/2: add character LCD platform data for RealView and Versatile
This adds some platform data for the character LCD found in the RealView and Versatile reference designs from ARM. Signed-off-by: Linus Walleij <triad@df.lth.se> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-versatile')
-rw-r--r--arch/arm/mach-versatile/core.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index f3a0e073e9ae..6ccd2618a97b 100644
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -355,6 +355,21 @@ static struct mmci_platform_data mmc0_plat_data = {
355 .gpio_cd = -1, 355 .gpio_cd = -1,
356}; 356};
357 357
358static struct resource char_lcd_resources[] = {
359 {
360 .start = VERSATILE_CHAR_LCD_BASE,
361 .end = (VERSATILE_CHAR_LCD_BASE + SZ_4K - 1),
362 .flags = IORESOURCE_MEM,
363 },
364};
365
366static struct platform_device char_lcd_device = {
367 .name = "arm-charlcd",
368 .id = -1,
369 .num_resources = ARRAY_SIZE(char_lcd_resources),
370 .resource = char_lcd_resources,
371};
372
358/* 373/*
359 * Clock handling 374 * Clock handling
360 */ 375 */
@@ -853,6 +868,7 @@ void __init versatile_init(void)
853 platform_device_register(&versatile_flash_device); 868 platform_device_register(&versatile_flash_device);
854 platform_device_register(&versatile_i2c_device); 869 platform_device_register(&versatile_i2c_device);
855 platform_device_register(&smc91x_device); 870 platform_device_register(&smc91x_device);
871 platform_device_register(&char_lcd_device);
856 872
857 for (i = 0; i < ARRAY_SIZE(amba_devs); i++) { 873 for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
858 struct amba_device *d = amba_devs[i]; 874 struct amba_device *d = amba_devs[i];