Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / arm / mach-at91 / at91sam9g45_devices.c

diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c
index f0bf68268ca2940b3cbbbe8b4c983920865708fd..acb703e13331e2a9931bb321d7c1f9f71d550f11 100644 (file)
--- 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[] = {
 };
 
 static struct platform_device at91_lcdc_device = {
-       .name           = "atmel_lcdfb",
        .id             = 0,
        .dev            = {
                                .dma_mask               = &lcdc_dmamask,
@@ -997,6 +996,11 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)
        if (!data)
                return;
 
+       if (cpu_is_at91sam9g45es())
+               at91_lcdc_device.name = "at91sam9g45es-lcdfb";
+       else
+               at91_lcdc_device.name = "at91sam9g45-lcdfb";
+
        at91_set_A_periph(AT91_PIN_PE0, 0);     /* LCDDPWR */
 
        at91_set_A_periph(AT91_PIN_PE2, 0);     /* LCDCC */