1 files changed, 14 insertions, 14 deletions

diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c
index b446645c7727..d3437624ca4e 100644
--- a/arch/arm/mach-at91/board-sam9261ek.c
+++ b/arch/arm/mach-at91/board-sam9261ek.c
@@ -264,11 +264,7 @@ static void __init ek_add_device_ts(void) {}
  */
 static struct at73c213_board_info at73c213_data = {
         .ssc_id         = 1,
-#if defined(CONFIG_MACH_AT91SAM9261EK)
-        .shortname      = "AT91SAM9261-EK external DAC",
-#else
-        .shortname      = "AT91SAM9G10-EK external DAC",
-#endif
+        .shortname      = "AT91SAM9261/9G10-EK external DAC",
 };
 
 #if defined(CONFIG_SND_AT73C213) || defined(CONFIG_SND_AT73C213_MODULE)
@@ -412,9 +408,6 @@ static struct atmel_lcdfb_info __initdata ek_lcdc_data = {
         .default_monspecs               = &at91fb_default_stn_monspecs,
         .atmel_lcdfb_power_control      = at91_lcdc_stn_power_control,
         .guard_time                     = 1,
-#if defined(CONFIG_MACH_AT91SAM9G10EK)
-        .lcd_wiring_mode                = ATMEL_LCDC_WIRING_RGB,
-#endif
 };
 
 #else
@@ -468,9 +461,6 @@ static struct atmel_lcdfb_info __initdata ek_lcdc_data = {
         .default_monspecs               = &at91fb_default_tft_monspecs,
         .atmel_lcdfb_power_control      = at91_lcdc_tft_power_control,
         .guard_time                     = 1,
-#if defined(CONFIG_MACH_AT91SAM9G10EK)
-        .lcd_wiring_mode                = ATMEL_LCDC_WIRING_RGB,
-#endif
 };
 #endif
 
@@ -574,6 +564,10 @@ static void __init ek_board_init(void)
         /* DBGU on ttyS0. (Rx & Tx only) */
         at91_register_uart(0, 0, 0);
         at91_add_device_serial();
+
+        if (cpu_is_at91sam9g10())
+                ek_lcdc_data.lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB;
+
         /* USB Host */
         at91_add_device_usbh(&ek_usbh_data);
         /* USB Device */
@@ -606,11 +600,17 @@ static void __init ek_board_init(void)
         at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
 }
 
-#if defined(CONFIG_MACH_AT91SAM9261EK)
 MACHINE_START(AT91SAM9261EK, "Atmel AT91SAM9261-EK")
-#else
+        /* Maintainer: Atmel */
+        .init_time      = at91sam926x_pit_init,
+        .map_io         = at91_map_io,
+        .handle_irq     = at91_aic_handle_irq,
+        .init_early     = ek_init_early,
+        .init_irq       = at91_init_irq_default,
+        .init_machine   = ek_board_init,
+MACHINE_END
+
 MACHINE_START(AT91SAM9G10EK, "Atmel AT91SAM9G10-EK")
-#endif
         /* Maintainer: Atmel */
         .init_time      = at91sam926x_pit_init,
         .map_io         = at91_map_io,