diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-at91/at91sam9261_devices.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9263_devices.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9g45_devices.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9rl_devices.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-at91/board-sam9261ek.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-at91/board-sam9263ek.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-at91/board-sam9m10g45ek.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-at91/board-sam9rlek.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-at91/board.h | 4 | ||||
-rw-r--r-- | arch/arm/mach-mmp/ttc_dkb.c | 4 | ||||
-rw-r--r-- | arch/avr32/boards/atngw100/evklcd10x.c | 8 | ||||
-rw-r--r-- | arch/avr32/boards/atngw100/mrmt.c | 4 | ||||
-rw-r--r-- | arch/avr32/boards/atstk1000/atstk1000.h | 2 | ||||
-rw-r--r-- | arch/avr32/boards/atstk1000/setup.c | 2 | ||||
-rw-r--r-- | arch/avr32/boards/favr-32/setup.c | 2 | ||||
-rw-r--r-- | arch/avr32/boards/hammerhead/setup.c | 2 | ||||
-rw-r--r-- | arch/avr32/boards/merisc/display.c | 2 | ||||
-rw-r--r-- | arch/avr32/boards/mimc200/setup.c | 4 | ||||
-rw-r--r-- | arch/avr32/mach-at32ap/at32ap700x.c | 8 | ||||
-rw-r--r-- | arch/avr32/mach-at32ap/include/mach/board.h | 4 |
20 files changed, 47 insertions, 49 deletions
diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c index 629ea5fc95cf..b2a34740146a 100644 --- a/arch/arm/mach-at91/at91sam9261_devices.c +++ b/arch/arm/mach-at91/at91sam9261_devices.c | |||
@@ -465,7 +465,7 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices) | |||
465 | 465 | ||
466 | #if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE) | 466 | #if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE) |
467 | static u64 lcdc_dmamask = DMA_BIT_MASK(32); | 467 | static u64 lcdc_dmamask = DMA_BIT_MASK(32); |
468 | static struct atmel_lcdfb_info lcdc_data; | 468 | static struct atmel_lcdfb_pdata lcdc_data; |
469 | 469 | ||
470 | static struct resource lcdc_resources[] = { | 470 | static struct resource lcdc_resources[] = { |
471 | [0] = { | 471 | [0] = { |
@@ -498,7 +498,7 @@ static struct platform_device at91_lcdc_device = { | |||
498 | .num_resources = ARRAY_SIZE(lcdc_resources), | 498 | .num_resources = ARRAY_SIZE(lcdc_resources), |
499 | }; | 499 | }; |
500 | 500 | ||
501 | void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) | 501 | void __init at91_add_device_lcdc(struct atmel_lcdfb_pdata *data) |
502 | { | 502 | { |
503 | if (!data) { | 503 | if (!data) { |
504 | return; | 504 | return; |
@@ -559,7 +559,7 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) | |||
559 | platform_device_register(&at91_lcdc_device); | 559 | platform_device_register(&at91_lcdc_device); |
560 | } | 560 | } |
561 | #else | 561 | #else |
562 | void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) {} | 562 | void __init at91_add_device_lcdc(struct atmel_lcdfb_pdata *data) {} |
563 | #endif | 563 | #endif |
564 | 564 | ||
565 | 565 | ||
diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c index 858c8aac2daf..4aeadddbc181 100644 --- a/arch/arm/mach-at91/at91sam9263_devices.c +++ b/arch/arm/mach-at91/at91sam9263_devices.c | |||
@@ -832,7 +832,7 @@ void __init at91_add_device_can(struct at91_can_data *data) {} | |||
832 | 832 | ||
833 | #if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE) | 833 | #if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE) |
834 | static u64 lcdc_dmamask = DMA_BIT_MASK(32); | 834 | static u64 lcdc_dmamask = DMA_BIT_MASK(32); |
835 | static struct atmel_lcdfb_info lcdc_data; | 835 | static struct atmel_lcdfb_pdata lcdc_data; |
836 | 836 | ||
837 | static struct resource lcdc_resources[] = { | 837 | static struct resource lcdc_resources[] = { |
838 | [0] = { | 838 | [0] = { |
@@ -859,7 +859,7 @@ static struct platform_device at91_lcdc_device = { | |||
859 | .num_resources = ARRAY_SIZE(lcdc_resources), | 859 | .num_resources = ARRAY_SIZE(lcdc_resources), |
860 | }; | 860 | }; |
861 | 861 | ||
862 | void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) | 862 | void __init at91_add_device_lcdc(struct atmel_lcdfb_pdata *data) |
863 | { | 863 | { |
864 | if (!data) | 864 | if (!data) |
865 | return; | 865 | return; |
@@ -891,7 +891,7 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) | |||
891 | platform_device_register(&at91_lcdc_device); | 891 | platform_device_register(&at91_lcdc_device); |
892 | } | 892 | } |
893 | #else | 893 | #else |
894 | void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) {} | 894 | void __init at91_add_device_lcdc(struct atmel_lcdfb_pdata *data) {} |
895 | #endif | 895 | #endif |
896 | 896 | ||
897 | 897 | ||
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c index acb703e13331..cb36fa872d30 100644 --- a/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c | |||
@@ -965,7 +965,7 @@ void __init at91_add_device_isi(struct isi_platform_data *data, | |||
965 | 965 | ||
966 | #if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE) | 966 | #if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE) |
967 | static u64 lcdc_dmamask = DMA_BIT_MASK(32); | 967 | static u64 lcdc_dmamask = DMA_BIT_MASK(32); |
968 | static struct atmel_lcdfb_info lcdc_data; | 968 | static struct atmel_lcdfb_pdata lcdc_data; |
969 | 969 | ||
970 | static struct resource lcdc_resources[] = { | 970 | static struct resource lcdc_resources[] = { |
971 | [0] = { | 971 | [0] = { |
@@ -991,7 +991,7 @@ static struct platform_device at91_lcdc_device = { | |||
991 | .num_resources = ARRAY_SIZE(lcdc_resources), | 991 | .num_resources = ARRAY_SIZE(lcdc_resources), |
992 | }; | 992 | }; |
993 | 993 | ||
994 | void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) | 994 | void __init at91_add_device_lcdc(struct atmel_lcdfb_pdata *data) |
995 | { | 995 | { |
996 | if (!data) | 996 | if (!data) |
997 | return; | 997 | return; |
@@ -1037,7 +1037,7 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) | |||
1037 | platform_device_register(&at91_lcdc_device); | 1037 | platform_device_register(&at91_lcdc_device); |
1038 | } | 1038 | } |
1039 | #else | 1039 | #else |
1040 | void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) {} | 1040 | void __init at91_add_device_lcdc(struct atmel_lcdfb_pdata *data) {} |
1041 | #endif | 1041 | #endif |
1042 | 1042 | ||
1043 | 1043 | ||
diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c index 352468f265a9..a698bdab2cce 100644 --- a/arch/arm/mach-at91/at91sam9rl_devices.c +++ b/arch/arm/mach-at91/at91sam9rl_devices.c | |||
@@ -498,7 +498,7 @@ void __init at91_add_device_ac97(struct ac97c_platform_data *data) {} | |||
498 | 498 | ||
499 | #if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE) | 499 | #if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE) |
500 | static u64 lcdc_dmamask = DMA_BIT_MASK(32); | 500 | static u64 lcdc_dmamask = DMA_BIT_MASK(32); |
501 | static struct atmel_lcdfb_info lcdc_data; | 501 | static struct atmel_lcdfb_pdata lcdc_data; |
502 | 502 | ||
503 | static struct resource lcdc_resources[] = { | 503 | static struct resource lcdc_resources[] = { |
504 | [0] = { | 504 | [0] = { |
@@ -525,7 +525,7 @@ static struct platform_device at91_lcdc_device = { | |||
525 | .num_resources = ARRAY_SIZE(lcdc_resources), | 525 | .num_resources = ARRAY_SIZE(lcdc_resources), |
526 | }; | 526 | }; |
527 | 527 | ||
528 | void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) | 528 | void __init at91_add_device_lcdc(struct atmel_lcdfb_pdata *data) |
529 | { | 529 | { |
530 | if (!data) { | 530 | if (!data) { |
531 | return; | 531 | return; |
@@ -557,7 +557,7 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) | |||
557 | platform_device_register(&at91_lcdc_device); | 557 | platform_device_register(&at91_lcdc_device); |
558 | } | 558 | } |
559 | #else | 559 | #else |
560 | void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) {} | 560 | void __init at91_add_device_lcdc(struct atmel_lcdfb_pdata *data) {} |
561 | #endif | 561 | #endif |
562 | 562 | ||
563 | 563 | ||
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 | ||
diff --git a/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c index 3284df05df14..8b4942cbb6d9 100644 --- a/arch/arm/mach-at91/board-sam9263ek.c +++ b/arch/arm/mach-at91/board-sam9263ek.c | |||
@@ -275,13 +275,13 @@ static struct fb_monspecs at91fb_default_monspecs = { | |||
275 | | ATMEL_LCDC_DISTYPE_TFT \ | 275 | | ATMEL_LCDC_DISTYPE_TFT \ |
276 | | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE) | 276 | | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE) |
277 | 277 | ||
278 | static void at91_lcdc_power_control(int on) | 278 | static void at91_lcdc_power_control(struct atmel_lcdfb_pdata *pdata, int on) |
279 | { | 279 | { |
280 | at91_set_gpio_value(AT91_PIN_PA30, on); | 280 | at91_set_gpio_value(AT91_PIN_PA30, on); |
281 | } | 281 | } |
282 | 282 | ||
283 | /* Driver datas */ | 283 | /* Driver datas */ |
284 | static struct atmel_lcdfb_info __initdata ek_lcdc_data = { | 284 | static struct atmel_lcdfb_pdata __initdata ek_lcdc_data = { |
285 | .lcdcon_is_backlight = true, | 285 | .lcdcon_is_backlight = true, |
286 | .default_bpp = 16, | 286 | .default_bpp = 16, |
287 | .default_dmacon = ATMEL_LCDC_DMAEN, | 287 | .default_dmacon = ATMEL_LCDC_DMAEN, |
@@ -292,7 +292,7 @@ static struct atmel_lcdfb_info __initdata ek_lcdc_data = { | |||
292 | }; | 292 | }; |
293 | 293 | ||
294 | #else | 294 | #else |
295 | static struct atmel_lcdfb_info __initdata ek_lcdc_data; | 295 | static struct atmel_lcdfb_pdata __initdata ek_lcdc_data; |
296 | #endif | 296 | #endif |
297 | 297 | ||
298 | 298 | ||
diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c index 2a94896a1375..ef39078c8ce2 100644 --- a/arch/arm/mach-at91/board-sam9m10g45ek.c +++ b/arch/arm/mach-at91/board-sam9m10g45ek.c | |||
@@ -284,7 +284,7 @@ static struct fb_monspecs at91fb_default_monspecs = { | |||
284 | | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE) | 284 | | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE) |
285 | 285 | ||
286 | /* Driver datas */ | 286 | /* Driver datas */ |
287 | static struct atmel_lcdfb_info __initdata ek_lcdc_data = { | 287 | static struct atmel_lcdfb_pdata __initdata ek_lcdc_data = { |
288 | .lcdcon_is_backlight = true, | 288 | .lcdcon_is_backlight = true, |
289 | .default_bpp = 32, | 289 | .default_bpp = 32, |
290 | .default_dmacon = ATMEL_LCDC_DMAEN, | 290 | .default_dmacon = ATMEL_LCDC_DMAEN, |
@@ -295,7 +295,7 @@ static struct atmel_lcdfb_info __initdata ek_lcdc_data = { | |||
295 | }; | 295 | }; |
296 | 296 | ||
297 | #else | 297 | #else |
298 | static struct atmel_lcdfb_info __initdata ek_lcdc_data; | 298 | static struct atmel_lcdfb_pdata __initdata ek_lcdc_data; |
299 | #endif | 299 | #endif |
300 | 300 | ||
301 | 301 | ||
diff --git a/arch/arm/mach-at91/board-sam9rlek.c b/arch/arm/mach-at91/board-sam9rlek.c index aa265dcf2128..604eecf6cd70 100644 --- a/arch/arm/mach-at91/board-sam9rlek.c +++ b/arch/arm/mach-at91/board-sam9rlek.c | |||
@@ -170,7 +170,7 @@ static struct fb_monspecs at91fb_default_monspecs = { | |||
170 | | ATMEL_LCDC_DISTYPE_TFT \ | 170 | | ATMEL_LCDC_DISTYPE_TFT \ |
171 | | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE) | 171 | | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE) |
172 | 172 | ||
173 | static void at91_lcdc_power_control(int on) | 173 | static void at91_lcdc_power_control(struct atmel_lcdfb_pdata *pdata, int on) |
174 | { | 174 | { |
175 | if (on) | 175 | if (on) |
176 | at91_set_gpio_value(AT91_PIN_PC1, 0); /* power up */ | 176 | at91_set_gpio_value(AT91_PIN_PC1, 0); /* power up */ |
@@ -179,7 +179,7 @@ static void at91_lcdc_power_control(int on) | |||
179 | } | 179 | } |
180 | 180 | ||
181 | /* Driver datas */ | 181 | /* Driver datas */ |
182 | static struct atmel_lcdfb_info __initdata ek_lcdc_data = { | 182 | static struct atmel_lcdfb_pdata __initdata ek_lcdc_data = { |
183 | .lcdcon_is_backlight = true, | 183 | .lcdcon_is_backlight = true, |
184 | .default_bpp = 16, | 184 | .default_bpp = 16, |
185 | .default_dmacon = ATMEL_LCDC_DMAEN, | 185 | .default_dmacon = ATMEL_LCDC_DMAEN, |
@@ -191,7 +191,7 @@ static struct atmel_lcdfb_info __initdata ek_lcdc_data = { | |||
191 | }; | 191 | }; |
192 | 192 | ||
193 | #else | 193 | #else |
194 | static struct atmel_lcdfb_info __initdata ek_lcdc_data; | 194 | static struct atmel_lcdfb_pdata __initdata ek_lcdc_data; |
195 | #endif | 195 | #endif |
196 | 196 | ||
197 | 197 | ||
diff --git a/arch/arm/mach-at91/board.h b/arch/arm/mach-at91/board.h index 4a234fb2ab3b..6c08b341167d 100644 --- a/arch/arm/mach-at91/board.h +++ b/arch/arm/mach-at91/board.h | |||
@@ -107,8 +107,8 @@ extern void __init at91_add_device_pwm(u32 mask); | |||
107 | extern void __init at91_add_device_ssc(unsigned id, unsigned pins); | 107 | extern void __init at91_add_device_ssc(unsigned id, unsigned pins); |
108 | 108 | ||
109 | /* LCD Controller */ | 109 | /* LCD Controller */ |
110 | struct atmel_lcdfb_info; | 110 | struct atmel_lcdfb_pdata; |
111 | extern void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data); | 111 | extern void __init at91_add_device_lcdc(struct atmel_lcdfb_pdata *data); |
112 | 112 | ||
113 | /* AC97 */ | 113 | /* AC97 */ |
114 | extern void __init at91_add_device_ac97(struct ac97c_platform_data *data); | 114 | extern void __init at91_add_device_ac97(struct ac97c_platform_data *data); |
diff --git a/arch/arm/mach-mmp/ttc_dkb.c b/arch/arm/mach-mmp/ttc_dkb.c index 702232996c8c..cfadd974f5ce 100644 --- a/arch/arm/mach-mmp/ttc_dkb.c +++ b/arch/arm/mach-mmp/ttc_dkb.c | |||
@@ -191,7 +191,6 @@ static struct pxa3xx_nand_platform_data dkb_nand_info = { | |||
191 | #define SCLK_SOURCE_SELECT(x) (x << 30) /* 0x0 ~ 0x3 */ | 191 | #define SCLK_SOURCE_SELECT(x) (x << 30) /* 0x0 ~ 0x3 */ |
192 | /* link config */ | 192 | /* link config */ |
193 | #define CFG_DUMBMODE(mode) (mode << 28) /* 0x0 ~ 0x6*/ | 193 | #define CFG_DUMBMODE(mode) (mode << 28) /* 0x0 ~ 0x6*/ |
194 | #define CFG_GRA_SWAPRB(x) (x << 0) /* 1: rbswap enabled */ | ||
195 | static struct mmp_mach_path_config dkb_disp_config[] = { | 194 | static struct mmp_mach_path_config dkb_disp_config[] = { |
196 | [0] = { | 195 | [0] = { |
197 | .name = "mmp-parallel", | 196 | .name = "mmp-parallel", |
@@ -199,8 +198,7 @@ static struct mmp_mach_path_config dkb_disp_config[] = { | |||
199 | .output_type = PATH_OUT_PARALLEL, | 198 | .output_type = PATH_OUT_PARALLEL, |
200 | .path_config = CFG_IOPADMODE(0x1) | 199 | .path_config = CFG_IOPADMODE(0x1) |
201 | | SCLK_SOURCE_SELECT(0x1), | 200 | | SCLK_SOURCE_SELECT(0x1), |
202 | .link_config = CFG_DUMBMODE(0x2) | 201 | .link_config = CFG_DUMBMODE(0x2), |
203 | | CFG_GRA_SWAPRB(0x1), | ||
204 | }, | 202 | }, |
205 | }; | 203 | }; |
206 | 204 | ||
diff --git a/arch/avr32/boards/atngw100/evklcd10x.c b/arch/avr32/boards/atngw100/evklcd10x.c index 20388750d564..64919b0da7aa 100644 --- a/arch/avr32/boards/atngw100/evklcd10x.c +++ b/arch/avr32/boards/atngw100/evklcd10x.c | |||
@@ -58,7 +58,7 @@ static struct fb_monspecs __initdata atevklcd10x_default_monspecs = { | |||
58 | .dclkmax = 28330000, | 58 | .dclkmax = 28330000, |
59 | }; | 59 | }; |
60 | 60 | ||
61 | static struct atmel_lcdfb_info __initdata atevklcd10x_lcdc_data = { | 61 | static struct atmel_lcdfb_pdata __initdata atevklcd10x_lcdc_data = { |
62 | .default_bpp = 16, | 62 | .default_bpp = 16, |
63 | .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, | 63 | .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, |
64 | .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT | 64 | .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT |
@@ -96,7 +96,7 @@ static struct fb_monspecs __initdata atevklcd10x_default_monspecs = { | |||
96 | .dclkmax = 7000000, | 96 | .dclkmax = 7000000, |
97 | }; | 97 | }; |
98 | 98 | ||
99 | static struct atmel_lcdfb_info __initdata atevklcd10x_lcdc_data = { | 99 | static struct atmel_lcdfb_pdata __initdata atevklcd10x_lcdc_data = { |
100 | .default_bpp = 16, | 100 | .default_bpp = 16, |
101 | .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, | 101 | .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, |
102 | .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT | 102 | .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT |
@@ -134,7 +134,7 @@ static struct fb_monspecs __initdata atevklcd10x_default_monspecs = { | |||
134 | .dclkmax = 6400000, | 134 | .dclkmax = 6400000, |
135 | }; | 135 | }; |
136 | 136 | ||
137 | static struct atmel_lcdfb_info __initdata atevklcd10x_lcdc_data = { | 137 | static struct atmel_lcdfb_pdata __initdata atevklcd10x_lcdc_data = { |
138 | .default_bpp = 16, | 138 | .default_bpp = 16, |
139 | .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, | 139 | .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, |
140 | .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT | 140 | .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT |
@@ -145,7 +145,7 @@ static struct atmel_lcdfb_info __initdata atevklcd10x_lcdc_data = { | |||
145 | }; | 145 | }; |
146 | #endif | 146 | #endif |
147 | 147 | ||
148 | static void atevklcd10x_lcdc_power_control(int on) | 148 | static void atevklcd10x_lcdc_power_control(struct atmel_lcdfb_pdata *pdata, int on) |
149 | { | 149 | { |
150 | gpio_set_value(GPIO_PIN_PB(15), on); | 150 | gpio_set_value(GPIO_PIN_PB(15), on); |
151 | } | 151 | } |
diff --git a/arch/avr32/boards/atngw100/mrmt.c b/arch/avr32/boards/atngw100/mrmt.c index 7de083d19b7e..1ba09e4c02b1 100644 --- a/arch/avr32/boards/atngw100/mrmt.c +++ b/arch/avr32/boards/atngw100/mrmt.c | |||
@@ -83,7 +83,7 @@ static struct fb_monspecs __initdata lcd_fb_default_monspecs = { | |||
83 | .dclkmax = 9260000, | 83 | .dclkmax = 9260000, |
84 | }; | 84 | }; |
85 | 85 | ||
86 | static struct atmel_lcdfb_info __initdata rmt_lcdc_data = { | 86 | static struct atmel_lcdfb_pdata __initdata rmt_lcdc_data = { |
87 | .default_bpp = 24, | 87 | .default_bpp = 24, |
88 | .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, | 88 | .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, |
89 | .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT | 89 | .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT |
@@ -126,7 +126,7 @@ static struct fb_monspecs __initdata lcd_fb_default_monspecs = { | |||
126 | .dclkmax = 9260000, | 126 | .dclkmax = 9260000, |
127 | }; | 127 | }; |
128 | 128 | ||
129 | static struct atmel_lcdfb_info __initdata rmt_lcdc_data = { | 129 | static struct atmel_lcdfb_pdata __initdata rmt_lcdc_data = { |
130 | .default_bpp = 24, | 130 | .default_bpp = 24, |
131 | .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, | 131 | .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, |
132 | .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT | 132 | .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT |
diff --git a/arch/avr32/boards/atstk1000/atstk1000.h b/arch/avr32/boards/atstk1000/atstk1000.h index 9392d3252865..653cc09e536c 100644 --- a/arch/avr32/boards/atstk1000/atstk1000.h +++ b/arch/avr32/boards/atstk1000/atstk1000.h | |||
@@ -10,7 +10,7 @@ | |||
10 | #ifndef __ARCH_AVR32_BOARDS_ATSTK1000_ATSTK1000_H | 10 | #ifndef __ARCH_AVR32_BOARDS_ATSTK1000_ATSTK1000_H |
11 | #define __ARCH_AVR32_BOARDS_ATSTK1000_ATSTK1000_H | 11 | #define __ARCH_AVR32_BOARDS_ATSTK1000_ATSTK1000_H |
12 | 12 | ||
13 | extern struct atmel_lcdfb_info atstk1000_lcdc_data; | 13 | extern struct atmel_lcdfb_pdata atstk1000_lcdc_data; |
14 | 14 | ||
15 | void atstk1000_setup_j2_leds(void); | 15 | void atstk1000_setup_j2_leds(void); |
16 | 16 | ||
diff --git a/arch/avr32/boards/atstk1000/setup.c b/arch/avr32/boards/atstk1000/setup.c index 2d6b560115d9..b6b88f5e0b43 100644 --- a/arch/avr32/boards/atstk1000/setup.c +++ b/arch/avr32/boards/atstk1000/setup.c | |||
@@ -55,7 +55,7 @@ static struct fb_monspecs __initdata atstk1000_default_monspecs = { | |||
55 | .dclkmax = 30000000, | 55 | .dclkmax = 30000000, |
56 | }; | 56 | }; |
57 | 57 | ||
58 | struct atmel_lcdfb_info __initdata atstk1000_lcdc_data = { | 58 | struct atmel_lcdfb_pdata __initdata atstk1000_lcdc_data = { |
59 | .default_bpp = 24, | 59 | .default_bpp = 24, |
60 | .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, | 60 | .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, |
61 | .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT | 61 | .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT |
diff --git a/arch/avr32/boards/favr-32/setup.c b/arch/avr32/boards/favr-32/setup.c index 27bd6fbe21cb..7b1f2cd85400 100644 --- a/arch/avr32/boards/favr-32/setup.c +++ b/arch/avr32/boards/favr-32/setup.c | |||
@@ -125,7 +125,7 @@ static struct fb_monspecs __initdata favr32_default_monspecs = { | |||
125 | .dclkmax = 28000000, | 125 | .dclkmax = 28000000, |
126 | }; | 126 | }; |
127 | 127 | ||
128 | struct atmel_lcdfb_info __initdata favr32_lcdc_data = { | 128 | struct atmel_lcdfb_pdata __initdata favr32_lcdc_data = { |
129 | .default_bpp = 16, | 129 | .default_bpp = 16, |
130 | .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, | 130 | .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, |
131 | .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT | 131 | .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT |
diff --git a/arch/avr32/boards/hammerhead/setup.c b/arch/avr32/boards/hammerhead/setup.c index 9d1efd1cd425..dc0e317f2ecd 100644 --- a/arch/avr32/boards/hammerhead/setup.c +++ b/arch/avr32/boards/hammerhead/setup.c | |||
@@ -77,7 +77,7 @@ static struct fb_monspecs __initdata hammerhead_hda350t_monspecs = { | |||
77 | .dclkmax = 10000000, | 77 | .dclkmax = 10000000, |
78 | }; | 78 | }; |
79 | 79 | ||
80 | struct atmel_lcdfb_info __initdata hammerhead_lcdc_data = { | 80 | struct atmel_lcdfb_pdata __initdata hammerhead_lcdc_data = { |
81 | .default_bpp = 24, | 81 | .default_bpp = 24, |
82 | .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, | 82 | .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, |
83 | .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT | 83 | .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT |
diff --git a/arch/avr32/boards/merisc/display.c b/arch/avr32/boards/merisc/display.c index 85a543cd4abc..e7683ee7ed40 100644 --- a/arch/avr32/boards/merisc/display.c +++ b/arch/avr32/boards/merisc/display.c | |||
@@ -45,7 +45,7 @@ static struct fb_monspecs merisc_fb_monspecs = { | |||
45 | .dclkmax = 30000000, | 45 | .dclkmax = 30000000, |
46 | }; | 46 | }; |
47 | 47 | ||
48 | struct atmel_lcdfb_info merisc_lcdc_data = { | 48 | struct atmel_lcdfb_pdata merisc_lcdc_data = { |
49 | .default_bpp = 24, | 49 | .default_bpp = 24, |
50 | .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, | 50 | .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, |
51 | .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT | 51 | .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT |
diff --git a/arch/avr32/boards/mimc200/setup.c b/arch/avr32/boards/mimc200/setup.c index 05358aa5ef7d..1cb8e9cc5cfa 100644 --- a/arch/avr32/boards/mimc200/setup.c +++ b/arch/avr32/boards/mimc200/setup.c | |||
@@ -8,7 +8,7 @@ | |||
8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | extern struct atmel_lcdfb_info mimc200_lcdc_data; | 11 | extern struct atmel_lcdfb_pdata mimc200_lcdc_data; |
12 | 12 | ||
13 | #include <linux/clk.h> | 13 | #include <linux/clk.h> |
14 | #include <linux/etherdevice.h> | 14 | #include <linux/etherdevice.h> |
@@ -71,7 +71,7 @@ static struct fb_monspecs __initdata mimc200_default_monspecs = { | |||
71 | .dclkmax = 25200000, | 71 | .dclkmax = 25200000, |
72 | }; | 72 | }; |
73 | 73 | ||
74 | struct atmel_lcdfb_info __initdata mimc200_lcdc_data = { | 74 | struct atmel_lcdfb_pdata __initdata mimc200_lcdc_data = { |
75 | .default_bpp = 16, | 75 | .default_bpp = 16, |
76 | .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, | 76 | .default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN, |
77 | .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT | 77 | .default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT |
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c index a68f3cf7c3c1..a1f4d1e91b52 100644 --- a/arch/avr32/mach-at32ap/at32ap700x.c +++ b/arch/avr32/mach-at32ap/at32ap700x.c | |||
@@ -1439,7 +1439,7 @@ fail: | |||
1439 | * LCDC | 1439 | * LCDC |
1440 | * -------------------------------------------------------------------- */ | 1440 | * -------------------------------------------------------------------- */ |
1441 | #if defined(CONFIG_CPU_AT32AP7000) || defined(CONFIG_CPU_AT32AP7002) | 1441 | #if defined(CONFIG_CPU_AT32AP7000) || defined(CONFIG_CPU_AT32AP7002) |
1442 | static struct atmel_lcdfb_info atmel_lcdfb0_data; | 1442 | static struct atmel_lcdfb_pdata atmel_lcdfb0_data; |
1443 | static struct resource atmel_lcdfb0_resource[] = { | 1443 | static struct resource atmel_lcdfb0_resource[] = { |
1444 | { | 1444 | { |
1445 | .start = 0xff000000, | 1445 | .start = 0xff000000, |
@@ -1467,12 +1467,12 @@ static struct clk atmel_lcdfb0_pixclk = { | |||
1467 | }; | 1467 | }; |
1468 | 1468 | ||
1469 | struct platform_device *__init | 1469 | struct platform_device *__init |
1470 | at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_info *data, | 1470 | at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_pdata *data, |
1471 | unsigned long fbmem_start, unsigned long fbmem_len, | 1471 | unsigned long fbmem_start, unsigned long fbmem_len, |
1472 | u64 pin_mask) | 1472 | u64 pin_mask) |
1473 | { | 1473 | { |
1474 | struct platform_device *pdev; | 1474 | struct platform_device *pdev; |
1475 | struct atmel_lcdfb_info *info; | 1475 | struct atmel_lcdfb_pdata *info; |
1476 | struct fb_monspecs *monspecs; | 1476 | struct fb_monspecs *monspecs; |
1477 | struct fb_videomode *modedb; | 1477 | struct fb_videomode *modedb; |
1478 | unsigned int modedb_size; | 1478 | unsigned int modedb_size; |
@@ -1529,7 +1529,7 @@ at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_info *data, | |||
1529 | } | 1529 | } |
1530 | 1530 | ||
1531 | info = pdev->dev.platform_data; | 1531 | info = pdev->dev.platform_data; |
1532 | memcpy(info, data, sizeof(struct atmel_lcdfb_info)); | 1532 | memcpy(info, data, sizeof(struct atmel_lcdfb_pdata)); |
1533 | info->default_monspecs = monspecs; | 1533 | info->default_monspecs = monspecs; |
1534 | 1534 | ||
1535 | pdev->name = "at32ap-lcdfb"; | 1535 | pdev->name = "at32ap-lcdfb"; |
diff --git a/arch/avr32/mach-at32ap/include/mach/board.h b/arch/avr32/mach-at32ap/include/mach/board.h index d485b0391357..f1a316d52c73 100644 --- a/arch/avr32/mach-at32ap/include/mach/board.h +++ b/arch/avr32/mach-at32ap/include/mach/board.h | |||
@@ -44,9 +44,9 @@ struct platform_device * | |||
44 | at32_add_device_spi(unsigned int id, struct spi_board_info *b, unsigned int n); | 44 | at32_add_device_spi(unsigned int id, struct spi_board_info *b, unsigned int n); |
45 | void at32_spi_setup_slaves(unsigned int bus_num, struct spi_board_info *b, unsigned int n); | 45 | void at32_spi_setup_slaves(unsigned int bus_num, struct spi_board_info *b, unsigned int n); |
46 | 46 | ||
47 | struct atmel_lcdfb_info; | 47 | struct atmel_lcdfb_pdata; |
48 | struct platform_device * | 48 | struct platform_device * |
49 | at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_info *data, | 49 | at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_pdata *data, |
50 | unsigned long fbmem_start, unsigned long fbmem_len, | 50 | unsigned long fbmem_start, unsigned long fbmem_len, |
51 | u64 pin_mask); | 51 | u64 pin_mask); |
52 | 52 | ||