diff options
Diffstat (limited to 'arch/arm/mach-at91/at91sam9g45_devices.c')
-rw-r--r-- | arch/arm/mach-at91/at91sam9g45_devices.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c index 827c9f2a70fb..fe626d431b69 100644 --- a/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c | |||
@@ -981,7 +981,6 @@ static struct resource lcdc_resources[] = { | |||
981 | }; | 981 | }; |
982 | 982 | ||
983 | static struct platform_device at91_lcdc_device = { | 983 | static struct platform_device at91_lcdc_device = { |
984 | .name = "atmel_lcdfb", | ||
985 | .id = 0, | 984 | .id = 0, |
986 | .dev = { | 985 | .dev = { |
987 | .dma_mask = &lcdc_dmamask, | 986 | .dma_mask = &lcdc_dmamask, |
@@ -997,6 +996,11 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) | |||
997 | if (!data) | 996 | if (!data) |
998 | return; | 997 | return; |
999 | 998 | ||
999 | if (cpu_is_at91sam9g45es()) | ||
1000 | at91_lcdc_device.name = "at91sam9g45es-lcdfb"; | ||
1001 | else | ||
1002 | at91_lcdc_device.name = "at91sam9g45-lcdfb"; | ||
1003 | |||
1000 | at91_set_A_periph(AT91_PIN_PE0, 0); /* LCDDPWR */ | 1004 | at91_set_A_periph(AT91_PIN_PE0, 0); /* LCDDPWR */ |
1001 | 1005 | ||
1002 | at91_set_A_periph(AT91_PIN_PE2, 0); /* LCDCC */ | 1006 | at91_set_A_periph(AT91_PIN_PE2, 0); /* LCDCC */ |