diff options
Diffstat (limited to 'arch/arm/mach-at91/at91sam9261_devices.c')
-rw-r--r-- | arch/arm/mach-at91/at91sam9261_devices.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c index 92e0f861084a..629ea5fc95cf 100644 --- a/arch/arm/mach-at91/at91sam9261_devices.c +++ b/arch/arm/mach-at91/at91sam9261_devices.c | |||
@@ -488,7 +488,6 @@ static struct resource lcdc_resources[] = { | |||
488 | }; | 488 | }; |
489 | 489 | ||
490 | static struct platform_device at91_lcdc_device = { | 490 | static struct platform_device at91_lcdc_device = { |
491 | .name = "atmel_lcdfb", | ||
492 | .id = 0, | 491 | .id = 0, |
493 | .dev = { | 492 | .dev = { |
494 | .dma_mask = &lcdc_dmamask, | 493 | .dma_mask = &lcdc_dmamask, |
@@ -505,6 +504,11 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) | |||
505 | return; | 504 | return; |
506 | } | 505 | } |
507 | 506 | ||
507 | if (cpu_is_at91sam9g10()) | ||
508 | at91_lcdc_device.name = "at91sam9g10-lcdfb"; | ||
509 | else | ||
510 | at91_lcdc_device.name = "at91sam9261-lcdfb"; | ||
511 | |||
508 | #if defined(CONFIG_FB_ATMEL_STN) | 512 | #if defined(CONFIG_FB_ATMEL_STN) |
509 | at91_set_A_periph(AT91_PIN_PB0, 0); /* LCDVSYNC */ | 513 | at91_set_A_periph(AT91_PIN_PB0, 0); /* LCDVSYNC */ |
510 | at91_set_A_periph(AT91_PIN_PB1, 0); /* LCDHSYNC */ | 514 | at91_set_A_periph(AT91_PIN_PB1, 0); /* LCDHSYNC */ |