Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c85f20a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'omapdrm-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next 

omapdrm changes for 4.8

* Update MAINTAINERS file for omapdrm and tilcdc
* PLL refactoring to allow versatile use of the PLL clocks
* Public omapdss header refactoring to separate omapfb and omapdrm
* Gamma table support
* Support reset GPIO and vcc regulator in omapdrm's panel-dpi
* Minor cleanups

* tag 'omapdrm-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (69 commits)
  drm/omapdrm: Implement gamma_lut atomic crtc properties
  drm/omapdrm: Workaround for errata i734 (LCD1 Gamma) in DSS dispc
  drm/omapdrm: Add gamma table support to DSS dispc
  drm: drm_helper_crtc_enable_color_mgmt() => drm_crtc_enable_color_mgmt()
  drm/omap: rename panel/encoder Kconfig names
  drm: omapdrm: add DSI mapping
  drm: omapdrm: Remove unused omap_framebuffer_bo function
  drm: omapdrm: Remove unused omap_gem_tiled_size function
  drm: omapdrm: panel-lgphilips-lb035q02: Remove unused backlight GPIO
  drm/omap: panel-dpi: implement support for a vcc regulator
  drm/omap: panel-dpi: make (limited) use of a reset gpio
  devicetree/bindings: add reset-gpios and vcc-supply for panel-dpi
  MAINTAINERS: Add maintainer for TI LCDC DRM driver
  MAINTAINERS: Add maintainer for OMAP DRM driver
  drm/omap: fix pitch round-up
  drm/omap: remove align_pitch()
  drm/omap: remove unnecessary pitch round-up
  drm/omap: remove unneeded gpio includes
  drm/omap: Remove the video/omapdss.h and move it's content to local header file
  [media] omap_vout: Switch to use the video/omapfb_dss.h header file
  ...
parents 76c6dccf 492a426a

Documentation/devicetree/bindings/display/panel/panel-dpi.txt

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ Required properties: 
Optional properties:

- label: a symbolic name for the panel

- enable-gpios: panel enable gpio

- reset-gpios: GPIO to control the RESET pin

- vcc-supply: phandle of regulator that will be used to enable power to the display



Required nodes:

- "panel-timing" containing video timings

MAINTAINERS

+15 −0
Original line number Diff line number Diff line
@@ -4104,6 +4104,21 @@ F: drivers/gpu/drm/vc4/ 
F:	include/uapi/drm/vc4_drm.h

F:	Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt



DRM DRIVERS FOR TI OMAP

M:	Tomi Valkeinen <tomi.valkeinen@ti.com>

L:	dri-devel@lists.freedesktop.org

S:	Maintained

F:	drivers/gpu/drm/omapdrm/

F:	Documentation/devicetree/bindings/display/ti/



DRM DRIVERS FOR TI LCDC

M:	Jyri Sarha <jsarha@ti.com>

R:	Tomi Valkeinen <tomi.valkeinen@ti.com>

L:	dri-devel@lists.freedesktop.org

S:	Maintained

F:	drivers/gpu/drm/tilcdc/

F:	Documentation/devicetree/bindings/display/tilcdc/



DSBR100 USB FM RADIO DRIVER

M:	Alexey Klimov <klimov.linux@gmail.com>

L:	linux-media@vger.kernel.org

arch/arm/mach-omap2/board-ldp.c

+2 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include "gpmc.h"

#include "gpmc-smsc911x.h"



#include <video/omapdss.h>

#include <linux/platform_data/omapdss.h>

#include <video/omap-panel-data.h>



#include "board-flash.h"
@@ -47,6 +47,7 @@ 
#include "hsmmc.h"

#include "control.h"

#include "common-board-devices.h"

#include "display.h"



#define LDP_SMSC911X_CS		1

#define LDP_SMSC911X_GPIO	152

arch/arm/mach-omap2/board-rx51-video.c

+2 −2
Original line number Diff line number Diff line
@@ -15,13 +15,14 @@ 
#include <linux/spi/spi.h>

#include <linux/mm.h>

#include <asm/mach-types.h>

#include <video/omapdss.h>

#include <linux/platform_data/omapdss.h>

#include <video/omap-panel-data.h>



#include <linux/platform_data/spi-omap2-mcspi.h>



#include "soc.h"

#include "board-rx51.h"

#include "display.h"



#include "mux.h"
@@ -32,7 +33,6 @@ 
static struct connector_atv_platform_data rx51_tv_pdata = {

	.name = "tv",

	.source = "venc.0",

	.connector_type = OMAP_DSS_VENC_TYPE_COMPOSITE,

	.invert_polarity = false,

};

arch/arm/mach-omap2/display.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include <linux/mfd/syscon.h>

#include <linux/regmap.h>



#include <video/omapdss.h>

#include <linux/platform_data/omapdss.h>

#include "omap_hwmod.h"

#include "omap_device.h"

#include "omap-pm.h"