Commit 78ebf0e349421156fe70f437ce6ce3daf068ef56
Exists in
master
and in
20 other branches
Merge tag 'fbdev-fixes-3.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
Pull fbdev fixes from Tomi Valkeinen: - omapdss: compilation fix and DVI fix for PandaBoard - mxsfb: fix colors when using 18bit LCD bus * tag 'fbdev-fixes-3.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: ARM: OMAP: dss-common: fix Panda's DVI DDC channel video: mxsfb: fix color settings for 18bit data bus and 32bpp OMAPDSS: analog-tv-connector: compile fix
Showing 3 changed files Side-by-side Diff
arch/arm/mach-omap2/dss-common.c
drivers/video/mxsfb.c
| ... | ... | @@ -239,24 +239,6 @@ |
| 239 | 239 | } |
| 240 | 240 | }; |
| 241 | 241 | |
| 242 | -static const struct fb_bitfield def_rgb666[] = { | |
| 243 | - [RED] = { | |
| 244 | - .offset = 16, | |
| 245 | - .length = 6, | |
| 246 | - }, | |
| 247 | - [GREEN] = { | |
| 248 | - .offset = 8, | |
| 249 | - .length = 6, | |
| 250 | - }, | |
| 251 | - [BLUE] = { | |
| 252 | - .offset = 0, | |
| 253 | - .length = 6, | |
| 254 | - }, | |
| 255 | - [TRANSP] = { /* no support for transparency */ | |
| 256 | - .length = 0, | |
| 257 | - } | |
| 258 | -}; | |
| 259 | - | |
| 260 | 242 | static const struct fb_bitfield def_rgb888[] = { |
| 261 | 243 | [RED] = { |
| 262 | 244 | .offset = 16, |
| ... | ... | @@ -309,9 +291,6 @@ |
| 309 | 291 | break; |
| 310 | 292 | case STMLCDIF_16BIT: |
| 311 | 293 | case STMLCDIF_18BIT: |
| 312 | - /* 24 bit to 18 bit mapping */ | |
| 313 | - rgb = def_rgb666; | |
| 314 | - break; | |
| 315 | 294 | case STMLCDIF_24BIT: |
| 316 | 295 | /* real 24 bit */ |
| 317 | 296 | rgb = def_rgb888; |
| ... | ... | @@ -453,11 +432,6 @@ |
| 453 | 432 | return -EINVAL; |
| 454 | 433 | case STMLCDIF_16BIT: |
| 455 | 434 | case STMLCDIF_18BIT: |
| 456 | - /* 24 bit to 18 bit mapping */ | |
| 457 | - ctrl |= CTRL_DF24; /* ignore the upper 2 bits in | |
| 458 | - * each colour component | |
| 459 | - */ | |
| 460 | - break; | |
| 461 | 435 | case STMLCDIF_24BIT: |
| 462 | 436 | /* real 24 bit */ |
| 463 | 437 | break; |
drivers/video/omap2/displays-new/connector-analog-tv.c
| ... | ... | @@ -28,6 +28,20 @@ |
| 28 | 28 | bool invert_polarity; |
| 29 | 29 | }; |
| 30 | 30 | |
| 31 | +static const struct omap_video_timings tvc_pal_timings = { | |
| 32 | + .x_res = 720, | |
| 33 | + .y_res = 574, | |
| 34 | + .pixel_clock = 13500, | |
| 35 | + .hsw = 64, | |
| 36 | + .hfp = 12, | |
| 37 | + .hbp = 68, | |
| 38 | + .vsw = 5, | |
| 39 | + .vfp = 5, | |
| 40 | + .vbp = 41, | |
| 41 | + | |
| 42 | + .interlace = true, | |
| 43 | +}; | |
| 44 | + | |
| 31 | 45 | #define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev) |
| 32 | 46 | |
| 33 | 47 | static int tvc_connect(struct omap_dss_device *dssdev) |
| 34 | 48 | |
| ... | ... | @@ -212,14 +226,14 @@ |
| 212 | 226 | return -ENODEV; |
| 213 | 227 | } |
| 214 | 228 | |
| 215 | - ddata->timings = omap_dss_pal_timings; | |
| 229 | + ddata->timings = tvc_pal_timings; | |
| 216 | 230 | |
| 217 | 231 | dssdev = &ddata->dssdev; |
| 218 | 232 | dssdev->driver = &tvc_driver; |
| 219 | 233 | dssdev->dev = &pdev->dev; |
| 220 | 234 | dssdev->type = OMAP_DISPLAY_TYPE_VENC; |
| 221 | 235 | dssdev->owner = THIS_MODULE; |
| 222 | - dssdev->panel.timings = omap_dss_pal_timings; | |
| 236 | + dssdev->panel.timings = tvc_pal_timings; | |
| 223 | 237 | |
| 224 | 238 | r = omapdss_register_display(dssdev); |
| 225 | 239 | if (r) { |