Merge tag 'drm/panel/for-3.15-rc1' of git://anongit.freedesktop.org/tegra/linux into...
authorDave Airlie <airlied@redhat.com>
Sat, 5 Apr 2014 06:12:27 +0000 (16:12 +1000)
committerDave Airlie <airlied@redhat.com>
Sat, 5 Apr 2014 06:12:27 +0000 (16:12 +1000)
drm/panel: Changes for v3.15-rc1

Add support for a couple more simple panels. A few cleanups to the
simple panel driver are also included (gpiod interface conversion,
removal of redundant call to regulator_disable()).

* tag 'drm/panel/for-3.15-rc1' of git://anongit.freedesktop.org/tegra/linux:
  drm/panel: add support for LG LD070WX3-SL01 panel
  drm/panel: add support for LG LH500WX1-SD03 panel
  drm/panel: simple: Allow DSI panels to provide mode flags
  drm/panel: simple: Allow GPIO accesses to sleep
  drm/panel: remove redundant regulator_disable()
  drm/panel: use gpiod interface for enable GPIO
  drm/panel: Add LG 12.9" LCD panel
  MAINTAINERS: Add entry for DRM panel drivers

Conflicts:
MAINTAINERS

1  2 
MAINTAINERS

diff --cc MAINTAINERS
index 1a308b8e10a43a7622848002cc506d6fa0890f12,1a43a9409f4027efd82679ab3bd897c3598334d4..4f56025da80234d6df71e4fc24d7bb4df23bbbb7
@@@ -2856,16 -2851,16 +2856,26 @@@ F:   drivers/gpu/drm
  F:    include/drm/
  F:    include/uapi/drm/
  
 +RADEON DRM DRIVERS
 +M:    Alex Deucher <alexander.deucher@amd.com>
 +M:    Christian König <christian.koenig@amd.com>
 +L:    dri-devel@lists.freedesktop.org
 +T:    git git://people.freedesktop.org/~agd5f/linux
 +S:    Supported
 +F:    drivers/gpu/drm/radeon/
 +F:    include/drm/radeon*
 +F:    include/uapi/drm/radeon*
 +
+ DRM PANEL DRIVERS
+ M:    Thierry Reding <thierry.reding@gmail.com>
+ L:    dri-devel@lists.freedesktop.org
+ T:    git git://anongit.freedesktop.org/tegra/linux.git
+ S:    Maintained
+ F:    drivers/gpu/drm/drm_panel.c
+ F:    drivers/gpu/drm/panel/
+ F:    include/drm/drm_panel.h
+ F:    Documentation/devicetree/bindings/panel/
  INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
  M:    Daniel Vetter <daniel.vetter@ffwll.ch>
  M:    Jani Nikula <jani.nikula@linux.intel.com>