diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-12 12:39:34 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-12 12:39:34 -0500 |
| commit | 14379cdc763dee2b92276ee15e9c1644df1f017a (patch) | |
| tree | ddda261d09afcd242bd2d502e812588218590887 /arch/arm | |
| parent | 4c05121e253beaf9f03cb31480f4aa676835404b (diff) | |
| parent | b82fe6ddd782f847332aeabf8cab980852f61629 (diff) | |
Merge tag 'fbdev-fixes-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
Pull fbdev fixes from Tomi Valkeinen:
- fix omap2plus_defconfig to enable omapfb as it was in v4.4
- ocfb: fix timings for margins
- s6e8ax0, da8xx-fb: fix compile warnings
- mmp: fix build failure caused by bad printk parameters
- imxfb: fix clock issue which kept the display off
* tag 'fbdev-fixes-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
video: fbdev: imxfb: Provide a reset mechanism
fbdev: mmp: print IRQ resource using %pR format string
fbdev: da8xx-fb: remove incorrect type cast
fbdev: s6e8ax0: avoid unused function warnings
ocfb: fix tgdel and tvdel timing parameters
ARM: omap2plus_defconfig: update display configs
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/omap2plus_defconfig | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index a7151744b85c..d18d6b42fcf5 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig | |||
| @@ -292,24 +292,23 @@ CONFIG_FB=y | |||
| 292 | CONFIG_FIRMWARE_EDID=y | 292 | CONFIG_FIRMWARE_EDID=y |
| 293 | CONFIG_FB_MODE_HELPERS=y | 293 | CONFIG_FB_MODE_HELPERS=y |
| 294 | CONFIG_FB_TILEBLITTING=y | 294 | CONFIG_FB_TILEBLITTING=y |
| 295 | CONFIG_OMAP2_DSS=m | 295 | CONFIG_FB_OMAP5_DSS_HDMI=y |
| 296 | CONFIG_OMAP5_DSS_HDMI=y | 296 | CONFIG_FB_OMAP2_DSS_SDI=y |
| 297 | CONFIG_OMAP2_DSS_SDI=y | 297 | CONFIG_FB_OMAP2_DSS_DSI=y |
| 298 | CONFIG_OMAP2_DSS_DSI=y | ||
| 299 | CONFIG_FB_OMAP2=m | 298 | CONFIG_FB_OMAP2=m |
| 300 | CONFIG_DISPLAY_ENCODER_TFP410=m | 299 | CONFIG_FB_OMAP2_ENCODER_TFP410=m |
| 301 | CONFIG_DISPLAY_ENCODER_TPD12S015=m | 300 | CONFIG_FB_OMAP2_ENCODER_TPD12S015=m |
| 302 | CONFIG_DISPLAY_CONNECTOR_DVI=m | 301 | CONFIG_FB_OMAP2_CONNECTOR_DVI=m |
| 303 | CONFIG_DISPLAY_CONNECTOR_HDMI=m | 302 | CONFIG_FB_OMAP2_CONNECTOR_HDMI=m |
| 304 | CONFIG_DISPLAY_CONNECTOR_ANALOG_TV=m | 303 | CONFIG_FB_OMAP2_CONNECTOR_ANALOG_TV=m |
| 305 | CONFIG_DISPLAY_PANEL_DPI=m | 304 | CONFIG_FB_OMAP2_PANEL_DPI=m |
| 306 | CONFIG_DISPLAY_PANEL_DSI_CM=m | 305 | CONFIG_FB_OMAP2_PANEL_DSI_CM=m |
| 307 | CONFIG_DISPLAY_PANEL_SONY_ACX565AKM=m | 306 | CONFIG_FB_OMAP2_PANEL_SONY_ACX565AKM=m |
| 308 | CONFIG_DISPLAY_PANEL_LGPHILIPS_LB035Q02=m | 307 | CONFIG_FB_OMAP2_PANEL_LGPHILIPS_LB035Q02=m |
| 309 | CONFIG_DISPLAY_PANEL_SHARP_LS037V7DW01=m | 308 | CONFIG_FB_OMAP2_PANEL_SHARP_LS037V7DW01=m |
| 310 | CONFIG_DISPLAY_PANEL_TPO_TD028TTEC1=m | 309 | CONFIG_FB_OMAP2_PANEL_TPO_TD028TTEC1=m |
| 311 | CONFIG_DISPLAY_PANEL_TPO_TD043MTEA1=m | 310 | CONFIG_FB_OMAP2_PANEL_TPO_TD043MTEA1=m |
| 312 | CONFIG_DISPLAY_PANEL_NEC_NL8048HL11=m | 311 | CONFIG_FB_OMAP2_PANEL_NEC_NL8048HL11=m |
| 313 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 312 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
| 314 | CONFIG_LCD_CLASS_DEVICE=y | 313 | CONFIG_LCD_CLASS_DEVICE=y |
| 315 | CONFIG_LCD_PLATFORM=y | 314 | CONFIG_LCD_PLATFORM=y |