Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9587319bfe53c1ba128c6d226a655c45c36a13df

Authored by Eric Miao
1 parent 5163304889

[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>

Showing 4 changed files with 14 additions and 30 deletions Side-by-side Diff

arch/arm/mach-pxa/cm-x2xx.c
Diff comments   View file @ 9587319
... ... @@ -210,10 +210,8 @@
210 210 static struct pxafb_mach_info generic_stn_320x240 = {
211 211 .modes = &generic_stn_320x240_mode,
212 212 .num_modes = 1,
213   - .lccr0 = 0,
214   - .lccr3 = (LCCR3_PixClkDiv(0x03) |
215   - LCCR3_Acb(0xff) |
216   - LCCR3_PCP),
  213 + .lcd_conn = LCD_COLOR_STN_8BPP | LCD_PCLK_EDGE_FALL |\
  214 + LCD_AC_BIAS_FREQ(0xff),
217 215 .cmap_inverse = 0,
218 216 .cmap_static = 0,
219 217 };
... ... @@ -236,10 +234,8 @@
236 234 static struct pxafb_mach_info generic_tft_640x480 = {
237 235 .modes = &generic_tft_640x480_mode,
238 236 .num_modes = 1,
239   - .lccr0 = (LCCR0_PAS),
240   - .lccr3 = (LCCR3_PixClkDiv(0x01) |
241   - LCCR3_Acb(0xff) |
242   - LCCR3_PCP),
  237 + .lcd_conn = LCD_COLOR_TFT_8BPP | LCD_PCLK_EDGE_FALL |\
  238 + LCD_AC_BIAS_FREQ(0xff),
243 239 .cmap_inverse = 0,
244 240 .cmap_static = 0,
245 241 };
... ... @@ -263,9 +259,7 @@
263 259 static struct pxafb_mach_info generic_crt_640x480 = {
264 260 .modes = &generic_crt_640x480_mode,
265 261 .num_modes = 1,
266   - .lccr0 = (LCCR0_PAS),
267   - .lccr3 = (LCCR3_PixClkDiv(0x01) |
268   - LCCR3_Acb(0xff)),
  262 + .lcd_conn = LCD_COLOR_TFT_8BPP | LCD_AC_BIAS_FREQ(0xff),
269 263 .cmap_inverse = 0,
270 264 .cmap_static = 0,
271 265 };
... ... @@ -289,9 +283,7 @@
289 283 static struct pxafb_mach_info generic_crt_800x600 = {
290 284 .modes = &generic_crt_800x600_mode,
291 285 .num_modes = 1,
292   - .lccr0 = (LCCR0_PAS),
293   - .lccr3 = (LCCR3_PixClkDiv(0x02) |
294   - LCCR3_Acb(0xff)),
  286 + .lcd_conn = LCD_COLOR_TFT_8BPP | LCD_AC_BIAS_FREQ(0xff),
295 287 .cmap_inverse = 0,
296 288 .cmap_static = 0,
297 289 };
... ... @@ -314,10 +306,7 @@
314 306 static struct pxafb_mach_info generic_tft_320x240 = {
315 307 .modes = &generic_tft_320x240_mode,
316 308 .num_modes = 1,
317   - .lccr0 = (LCCR0_PAS),
318   - .lccr3 = (LCCR3_PixClkDiv(0x06) |
319   - LCCR3_Acb(0xff) |
320   - LCCR3_PCP),
  309 + .lcd_conn = LCD_COLOR_TFT_16BPP | LCD_AC_BIAS_FREQ(0xff),
321 310 .cmap_inverse = 0,
322 311 .cmap_static = 0,
323 312 };
... ... @@ -341,9 +330,7 @@
341 330 static struct pxafb_mach_info generic_stn_640x480 = {
342 331 .modes = &generic_stn_640x480_mode,
343 332 .num_modes = 1,
344   - .lccr0 = 0,
345   - .lccr3 = (LCCR3_PixClkDiv(0x02) |
346   - LCCR3_Acb(0xff)),
  333 + .lcd_conn = LCD_COLOR_STN_8BPP | LCD_AC_BIAS_FREQ(0xff),
347 334 .cmap_inverse = 0,
348 335 .cmap_static = 0,
349 336 };
arch/arm/mach-pxa/e400.c
Diff comments   View file @ 9587319
... ... @@ -46,7 +46,7 @@
46 46 static struct pxafb_mach_info e400_pxafb_mach_info = {
47 47 .modes = &e400_pxafb_mode_info,
48 48 .num_modes = 1,
49   - .lccr0 = LCCR0_Color | LCCR0_Sngl | LCCR0_Act,
  49 + .lcd_conn = LCD_COLOR_TFT_16BPP,
50 50 .lccr3 = 0,
51 51 .pxafb_backlight_power = NULL,
52 52 };
arch/arm/mach-pxa/magician.c
Diff comments   View file @ 9587319
... ... @@ -336,8 +336,7 @@
336 336 .modes = toppoly_modes,
337 337 .num_modes = 1,
338 338 .fixed_modes = 1,
339   - .lccr0 = LCCR0_Color | LCCR0_Sngl | LCCR0_Act,
340   - .lccr3 = LCCR3_PixRsEdg,
  339 + .lcd_conn = LCD_COLOR_TFT_16BPP,
341 340 .pxafb_lcd_power = toppoly_lcd_power,
342 341 };
343 342  
... ... @@ -345,8 +344,8 @@
345 344 .modes = samsung_modes,
346 345 .num_modes = 1,
347 346 .fixed_modes = 1,
348   - .lccr0 = LCCR0_LDDALT | LCCR0_Color | LCCR0_Sngl | LCCR0_Act,
349   - .lccr3 = LCCR3_PixFlEdg,
  347 + .lcd_conn = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL |\
  348 + LCD_ALTERNATE_MAPPING,
350 349 .pxafb_lcd_power = samsung_lcd_power,
351 350 };
352 351  
arch/arm/mach-pxa/pcm990-baseboard.c
Diff comments   View file @ 9587319
... ... @@ -104,8 +104,7 @@
104 104 static struct pxafb_mach_info pcm990_fbinfo __initdata = {
105 105 .modes = &fb_info_sharp_lq084v1dg21,
106 106 .num_modes = 1,
107   - .lccr0 = LCCR0_PAS,
108   - .lccr3 = LCCR3_PCP,
  107 + .lcd_conn = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL,
109 108 .pxafb_lcd_power = pcm990_lcd_power,
110 109 };
111 110 #elif defined(CONFIG_PCM990_DISPLAY_NEC)
... ... @@ -127,8 +126,7 @@
127 126 static struct pxafb_mach_info pcm990_fbinfo __initdata = {
128 127 .modes = &fb_info_nec_nl6448bc20_18d,
129 128 .num_modes = 1,
130   - .lccr0 = LCCR0_Act,
131   - .lccr3 = LCCR3_PixFlEdg,
  129 + .lcd_conn = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL,
132 130 .pxafb_lcd_power = pcm990_lcd_power,
133 131 };
134 132 #endif