aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorEric Miao <eric.miao@marvell.com>2008-12-07 04:49:01 -0500
committerEric Miao <eric.miao@marvell.com>2008-12-17 09:45:30 -0500
commit9587319bfe53c1ba128c6d226a655c45c36a13df (patch)
treed3ec24c8abe8feca8ab1de539d432ca425af64ad /arch
parent51633048890ca755bce2411e13a2f84ec661a068 (diff)
[ARM] pxa: convert legacy LCD setup of other boards to new one
Signed-off-by: Eric Miao <eric.miao@marvell.com> Cc: Richard Purdie <rpurdie@rpsys.net> Cc: Ian Molton <spyro@f2s.com> Cc: pHilipp Zabel <philipp.zabel@gmail.com> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Cc: Juergen Schindele <linux@schindele.name> Acked-by: Stefan Schmidt <stefan@datenfreihafen.org> Acked-by: Marc Zyngier <maz@misterjones.org> Acked-by: Mike Rapoport <mike@compulab.co.il> Acked-by: Jaya Kumar <jayakumar.lkml@gmail.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-pxa/cm-x2xx.c29
-rw-r--r--arch/arm/mach-pxa/e400.c2
-rw-r--r--arch/arm/mach-pxa/magician.c7
-rw-r--r--arch/arm/mach-pxa/pcm990-baseboard.c6
4 files changed, 14 insertions, 30 deletions
diff --git a/arch/arm/mach-pxa/cm-x2xx.c b/arch/arm/mach-pxa/cm-x2xx.c
index 0b3ce3b6d896..d99fd9e4d888 100644
--- a/arch/arm/mach-pxa/cm-x2xx.c
+++ b/arch/arm/mach-pxa/cm-x2xx.c
@@ -210,10 +210,8 @@ static struct pxafb_mode_info generic_stn_320x240_mode = {
210static struct pxafb_mach_info generic_stn_320x240 = { 210static struct pxafb_mach_info generic_stn_320x240 = {
211 .modes = &generic_stn_320x240_mode, 211 .modes = &generic_stn_320x240_mode,
212 .num_modes = 1, 212 .num_modes = 1,
213 .lccr0 = 0, 213 .lcd_conn = LCD_COLOR_STN_8BPP | LCD_PCLK_EDGE_FALL |\
214 .lccr3 = (LCCR3_PixClkDiv(0x03) | 214 LCD_AC_BIAS_FREQ(0xff),
215 LCCR3_Acb(0xff) |
216 LCCR3_PCP),
217 .cmap_inverse = 0, 215 .cmap_inverse = 0,
218 .cmap_static = 0, 216 .cmap_static = 0,
219}; 217};
@@ -236,10 +234,8 @@ static struct pxafb_mode_info generic_tft_640x480_mode = {
236static struct pxafb_mach_info generic_tft_640x480 = { 234static struct pxafb_mach_info generic_tft_640x480 = {
237 .modes = &generic_tft_640x480_mode, 235 .modes = &generic_tft_640x480_mode,
238 .num_modes = 1, 236 .num_modes = 1,
239 .lccr0 = (LCCR0_PAS), 237 .lcd_conn = LCD_COLOR_TFT_8BPP | LCD_PCLK_EDGE_FALL |\
240 .lccr3 = (LCCR3_PixClkDiv(0x01) | 238 LCD_AC_BIAS_FREQ(0xff),
241 LCCR3_Acb(0xff) |
242 LCCR3_PCP),
243 .cmap_inverse = 0, 239 .cmap_inverse = 0,
244 .cmap_static = 0, 240 .cmap_static = 0,
245}; 241};
@@ -263,9 +259,7 @@ static struct pxafb_mode_info generic_crt_640x480_mode = {
263static struct pxafb_mach_info generic_crt_640x480 = { 259static struct pxafb_mach_info generic_crt_640x480 = {
264 .modes = &generic_crt_640x480_mode, 260 .modes = &generic_crt_640x480_mode,
265 .num_modes = 1, 261 .num_modes = 1,
266 .lccr0 = (LCCR0_PAS), 262 .lcd_conn = LCD_COLOR_TFT_8BPP | LCD_AC_BIAS_FREQ(0xff),
267 .lccr3 = (LCCR3_PixClkDiv(0x01) |
268 LCCR3_Acb(0xff)),
269 .cmap_inverse = 0, 263 .cmap_inverse = 0,
270 .cmap_static = 0, 264 .cmap_static = 0,
271}; 265};
@@ -289,9 +283,7 @@ static struct pxafb_mode_info generic_crt_800x600_mode = {
289static struct pxafb_mach_info generic_crt_800x600 = { 283static struct pxafb_mach_info generic_crt_800x600 = {
290 .modes = &generic_crt_800x600_mode, 284 .modes = &generic_crt_800x600_mode,
291 .num_modes = 1, 285 .num_modes = 1,
292 .lccr0 = (LCCR0_PAS), 286 .lcd_conn = LCD_COLOR_TFT_8BPP | LCD_AC_BIAS_FREQ(0xff),
293 .lccr3 = (LCCR3_PixClkDiv(0x02) |
294 LCCR3_Acb(0xff)),
295 .cmap_inverse = 0, 287 .cmap_inverse = 0,
296 .cmap_static = 0, 288 .cmap_static = 0,
297}; 289};
@@ -314,10 +306,7 @@ static struct pxafb_mode_info generic_tft_320x240_mode = {
314static struct pxafb_mach_info generic_tft_320x240 = { 306static struct pxafb_mach_info generic_tft_320x240 = {
315 .modes = &generic_tft_320x240_mode, 307 .modes = &generic_tft_320x240_mode,
316 .num_modes = 1, 308 .num_modes = 1,
317 .lccr0 = (LCCR0_PAS), 309 .lcd_conn = LCD_COLOR_TFT_16BPP | LCD_AC_BIAS_FREQ(0xff),
318 .lccr3 = (LCCR3_PixClkDiv(0x06) |
319 LCCR3_Acb(0xff) |
320 LCCR3_PCP),
321 .cmap_inverse = 0, 310 .cmap_inverse = 0,
322 .cmap_static = 0, 311 .cmap_static = 0,
323}; 312};
@@ -341,9 +330,7 @@ static struct pxafb_mode_info generic_stn_640x480_mode = {
341static struct pxafb_mach_info generic_stn_640x480 = { 330static struct pxafb_mach_info generic_stn_640x480 = {
342 .modes = &generic_stn_640x480_mode, 331 .modes = &generic_stn_640x480_mode,
343 .num_modes = 1, 332 .num_modes = 1,
344 .lccr0 = 0, 333 .lcd_conn = LCD_COLOR_STN_8BPP | LCD_AC_BIAS_FREQ(0xff),
345 .lccr3 = (LCCR3_PixClkDiv(0x02) |
346 LCCR3_Acb(0xff)),
347 .cmap_inverse = 0, 334 .cmap_inverse = 0,
348 .cmap_static = 0, 335 .cmap_static = 0,
349}; 336};
diff --git a/arch/arm/mach-pxa/e400.c b/arch/arm/mach-pxa/e400.c
index 544bbaa20621..ed8bb543a390 100644
--- a/arch/arm/mach-pxa/e400.c
+++ b/arch/arm/mach-pxa/e400.c
@@ -46,7 +46,7 @@ static struct pxafb_mode_info e400_pxafb_mode_info = {
46static struct pxafb_mach_info e400_pxafb_mach_info = { 46static struct pxafb_mach_info e400_pxafb_mach_info = {
47 .modes = &e400_pxafb_mode_info, 47 .modes = &e400_pxafb_mode_info,
48 .num_modes = 1, 48 .num_modes = 1,
49 .lccr0 = LCCR0_Color | LCCR0_Sngl | LCCR0_Act, 49 .lcd_conn = LCD_COLOR_TFT_16BPP,
50 .lccr3 = 0, 50 .lccr3 = 0,
51 .pxafb_backlight_power = NULL, 51 .pxafb_backlight_power = NULL,
52}; 52};
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index bf59cec27def..21b821e1a60d 100644
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -336,8 +336,7 @@ static struct pxafb_mach_info toppoly_info = {
336 .modes = toppoly_modes, 336 .modes = toppoly_modes,
337 .num_modes = 1, 337 .num_modes = 1,
338 .fixed_modes = 1, 338 .fixed_modes = 1,
339 .lccr0 = LCCR0_Color | LCCR0_Sngl | LCCR0_Act, 339 .lcd_conn = LCD_COLOR_TFT_16BPP,
340 .lccr3 = LCCR3_PixRsEdg,
341 .pxafb_lcd_power = toppoly_lcd_power, 340 .pxafb_lcd_power = toppoly_lcd_power,
342}; 341};
343 342
@@ -345,8 +344,8 @@ static struct pxafb_mach_info samsung_info = {
345 .modes = samsung_modes, 344 .modes = samsung_modes,
346 .num_modes = 1, 345 .num_modes = 1,
347 .fixed_modes = 1, 346 .fixed_modes = 1,
348 .lccr0 = LCCR0_LDDALT | LCCR0_Color | LCCR0_Sngl | LCCR0_Act, 347 .lcd_conn = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL |\
349 .lccr3 = LCCR3_PixFlEdg, 348 LCD_ALTERNATE_MAPPING,
350 .pxafb_lcd_power = samsung_lcd_power, 349 .pxafb_lcd_power = samsung_lcd_power,
351}; 350};
352 351
diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c
index 1e7515452285..d2d2847f1e23 100644
--- a/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -104,8 +104,7 @@ static struct pxafb_mode_info fb_info_sharp_lq084v1dg21 = {
104static struct pxafb_mach_info pcm990_fbinfo __initdata = { 104static struct pxafb_mach_info pcm990_fbinfo __initdata = {
105 .modes = &fb_info_sharp_lq084v1dg21, 105 .modes = &fb_info_sharp_lq084v1dg21,
106 .num_modes = 1, 106 .num_modes = 1,
107 .lccr0 = LCCR0_PAS, 107 .lcd_conn = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL,
108 .lccr3 = LCCR3_PCP,
109 .pxafb_lcd_power = pcm990_lcd_power, 108 .pxafb_lcd_power = pcm990_lcd_power,
110}; 109};
111#elif defined(CONFIG_PCM990_DISPLAY_NEC) 110#elif defined(CONFIG_PCM990_DISPLAY_NEC)
@@ -127,8 +126,7 @@ struct pxafb_mode_info fb_info_nec_nl6448bc20_18d = {
127static struct pxafb_mach_info pcm990_fbinfo __initdata = { 126static struct pxafb_mach_info pcm990_fbinfo __initdata = {
128 .modes = &fb_info_nec_nl6448bc20_18d, 127 .modes = &fb_info_nec_nl6448bc20_18d,
129 .num_modes = 1, 128 .num_modes = 1,
130 .lccr0 = LCCR0_Act, 129 .lcd_conn = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL,
131 .lccr3 = LCCR3_PixFlEdg,
132 .pxafb_lcd_power = pcm990_lcd_power, 130 .pxafb_lcd_power = pcm990_lcd_power,
133}; 131};
134#endif 132#endif