diff options
Diffstat (limited to 'arch/arm/mach-at91/board-sam9261ek.c')
-rw-r--r-- | arch/arm/mach-at91/board-sam9261ek.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c index d3437624ca4e..473546b9408b 100644 --- a/arch/arm/mach-at91/board-sam9261ek.c +++ b/arch/arm/mach-at91/board-sam9261ek.c | |||
@@ -389,7 +389,7 @@ static struct fb_monspecs at91fb_default_stn_monspecs = { | |||
389 | | ATMEL_LCDC_IFWIDTH_4 \ | 389 | | ATMEL_LCDC_IFWIDTH_4 \ |
390 | | ATMEL_LCDC_SCANMOD_SINGLE) | 390 | | ATMEL_LCDC_SCANMOD_SINGLE) |
391 | 391 | ||
392 | static void at91_lcdc_stn_power_control(int on) | 392 | static void at91_lcdc_stn_power_control(struct atmel_lcdfb_pdata *pdata, int on) |
393 | { | 393 | { |
394 | /* backlight */ | 394 | /* backlight */ |
395 | if (on) { /* power up */ | 395 | if (on) { /* power up */ |
@@ -401,7 +401,7 @@ static void at91_lcdc_stn_power_control(int on) | |||
401 | } | 401 | } |
402 | } | 402 | } |
403 | 403 | ||
404 | static struct atmel_lcdfb_info __initdata ek_lcdc_data = { | 404 | static struct atmel_lcdfb_pdata __initdata ek_lcdc_data = { |
405 | .default_bpp = 1, | 405 | .default_bpp = 1, |
406 | .default_dmacon = ATMEL_LCDC_DMAEN, | 406 | .default_dmacon = ATMEL_LCDC_DMAEN, |
407 | .default_lcdcon2 = AT91SAM9261_DEFAULT_STN_LCDCON2, | 407 | .default_lcdcon2 = AT91SAM9261_DEFAULT_STN_LCDCON2, |
@@ -445,7 +445,7 @@ static struct fb_monspecs at91fb_default_tft_monspecs = { | |||
445 | | ATMEL_LCDC_DISTYPE_TFT \ | 445 | | ATMEL_LCDC_DISTYPE_TFT \ |
446 | | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE) | 446 | | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE) |
447 | 447 | ||
448 | static void at91_lcdc_tft_power_control(int on) | 448 | static void at91_lcdc_tft_power_control(struct atmel_lcdfb_pdata *pdata, int on) |
449 | { | 449 | { |
450 | if (on) | 450 | if (on) |
451 | at91_set_gpio_value(AT91_PIN_PA12, 0); /* power up */ | 451 | at91_set_gpio_value(AT91_PIN_PA12, 0); /* power up */ |
@@ -453,7 +453,7 @@ static void at91_lcdc_tft_power_control(int on) | |||
453 | at91_set_gpio_value(AT91_PIN_PA12, 1); /* power down */ | 453 | at91_set_gpio_value(AT91_PIN_PA12, 1); /* power down */ |
454 | } | 454 | } |
455 | 455 | ||
456 | static struct atmel_lcdfb_info __initdata ek_lcdc_data = { | 456 | static struct atmel_lcdfb_pdata __initdata ek_lcdc_data = { |
457 | .lcdcon_is_backlight = true, | 457 | .lcdcon_is_backlight = true, |
458 | .default_bpp = 16, | 458 | .default_bpp = 16, |
459 | .default_dmacon = ATMEL_LCDC_DMAEN, | 459 | .default_dmacon = ATMEL_LCDC_DMAEN, |
@@ -465,7 +465,7 @@ static struct atmel_lcdfb_info __initdata ek_lcdc_data = { | |||
465 | #endif | 465 | #endif |
466 | 466 | ||
467 | #else | 467 | #else |
468 | static struct atmel_lcdfb_info __initdata ek_lcdc_data; | 468 | static struct atmel_lcdfb_pdata __initdata ek_lcdc_data; |
469 | #endif | 469 | #endif |
470 | 470 | ||
471 | 471 | ||