Merge tag 'drm/panel/for-4.12-rc1' of git://anongit.freedesktop.org/tegra/linux into...

drm/panel: Changes for v4.12-rc1

This contains two new drivers for a Sitronix and a Samsung panel as well
as two new panels supported by the panel-simple driver.

* tag 'drm/panel/for-4.12-rc1' of git://anongit.freedesktop.org/tegra/linux:
  drm/panel: simple: Add support for Winstar WF35LTIACD
  devicetree: add vendor prefix for Winstar Display Corp.
  drm/panel: Add driver for sitronix ST7789V LCD controller
  dt-bindings: display: panel: Add bindings for the Sitronix ST7789V panel
  drm/panel: Add support for S6E3HA2 panel driver on TM2 board
  dt-bindings: Add support for Samsung s6e3ha2 panel binding
  drm/panel: simple: Add support for Ampire AM-480272H3TMQW-T01H
  dt-bindings: Add Ampire AM-480272H3TMQW-T01H panel

diff --combined Documentation/devicetree/bindings/vendor-prefixes.txt
index 4686f4bdaca060f9bed13c287ec53c99f70a1e9c,cb07d76b5db8922d2dd0879b87a950027ae5079d..aed180d8e5850fce7b6d1e2569b766831e764cdd
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -178,7 -178,6 +178,7 @@@ maxim      Maxim Integrated Product
  mcube mCube
  meas  Measurement Specialties
  mediatek      MediaTek Inc.
 +megachips     MegaChips
  melexis       Melexis N.V.
  melfas        MELFAS Inc.
  memsic        MEMSIC Inc.
@@@ -336,6 -335,7 +336,7 @@@ wd Western Digital Corp
  wetek WeTek Electronics, limited.
  wexler        Wexler
  winbond Winbond Electronics corp.
+ winstar       Winstar Display Corp.
  wlf   Wolfson Microelectronics
  wm    Wondermedia Technologies, Inc.
  x-powers      X-Powers

diff --combined drivers/gpu/drm/panel/Kconfig
index 5dc2106da2bc0d61dece9e0ccd6500cd480fffe2,0756986caa2bdc98270a9e901c86c2e5c9296bb6..3e29a9903303eb6c3f916bbfc3a06c538880d1b3
--- 1/drivers/gpu/drm/panel/Kconfig
--- 2/drivers/gpu/drm/panel/Kconfig
+++ b/drivers/gpu/drm/panel/Kconfig
@@@ -7,16 -7,6 +7,16 @@@ config DRM_PANE
  menu "Display Panels"
        depends on DRM && DRM_PANEL
  
 +config DRM_PANEL_LVDS
 +      tristate "Generic LVDS panel driver"
 +      depends on OF
 +      depends on BACKLIGHT_CLASS_DEVICE
 +      select VIDEOMODE_HELPERS
 +      help
 +        This driver supports LVDS panels that don't require device-specific
 +        handling of power supplies or control signals. It implements automatic
 +        backlight handling if the panel is attached to a backlight controller.
 +
  config DRM_PANEL_SIMPLE
        tristate "support for simple panels"
        depends on OF
@@@ -62,6 -52,12 +62,12 @@@ config DRM_PANEL_PANASONIC_VVX10F034N0
          WUXGA (1920x1200) Novatek NT1397-based DSI panel as found in some
          Xperia Z2 tablets
  
+ config DRM_PANEL_SAMSUNG_S6E3HA2
+       tristate "Samsung S6E3HA2 DSI video mode panel"
+       depends on OF
+       depends on DRM_MIPI_DSI
+       select VIDEOMODE_HELPERS
+ 
  config DRM_PANEL_SAMSUNG_S6E8AA0
        tristate "Samsung S6E8AA0 DSI video mode panel"
        depends on OF
@@@ -91,4 -87,11 +97,11 @@@ config DRM_PANEL_SHARP_LS043T1LE0
          Say Y here if you want to enable support for Sharp LS043T1LE01 qHD
          (540x960) DSI panel as found on the Qualcomm APQ8074 Dragonboard
  
+ config DRM_PANEL_SITRONIX_ST7789V
+       tristate "Sitronix ST7789V panel"
+       depends on OF && SPI
+       help
+         Say Y here if you want to enable support for the Sitronix
+         ST7789V controller for 240x320 LCD panels
+ 
  endmenu

diff --combined drivers/gpu/drm/panel/Makefile
index 20b5060d1f47cb34e3be793de5502781c2f4f6e7,3f2f926eddeccc648d2dc065ef98fc33f4c885ee..292b3c77aede43fd8239a4b0a90571d68f83ace0
--- 1/drivers/gpu/drm/panel/Makefile
--- 2/drivers/gpu/drm/panel/Makefile
+++ b/drivers/gpu/drm/panel/Makefile
@@@ -1,9 -1,10 +1,11 @@@
 +obj-$(CONFIG_DRM_PANEL_LVDS) += panel-lvds.o
  obj-$(CONFIG_DRM_PANEL_SIMPLE) += panel-simple.o
  obj-$(CONFIG_DRM_PANEL_JDI_LT070ME05000) += panel-jdi-lt070me05000.o
  obj-$(CONFIG_DRM_PANEL_LG_LG4573) += panel-lg-lg4573.o
  obj-$(CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00) += panel-panasonic-vvx10f034n00.o
  obj-$(CONFIG_DRM_PANEL_SAMSUNG_LD9040) += panel-samsung-ld9040.o
+ obj-$(CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2) += panel-samsung-s6e3ha2.o
  obj-$(CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0) += panel-samsung-s6e8aa0.o
  obj-$(CONFIG_DRM_PANEL_SHARP_LQ101R1SX01) += panel-sharp-lq101r1sx01.o
  obj-$(CONFIG_DRM_PANEL_SHARP_LS043T1LE01) += panel-sharp-ls043t1le01.o
+ obj-$(CONFIG_DRM_PANEL_SITRONIX_ST7789V) += panel-sitronix-st7789v.o