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

Commit f1777aaf authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'omapdrm-4.7-fixes' of... 

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

omapdrm fixes for 4.7

* multiple compile break fixes for missing includes, bad kconfig dependencies.
* remove regulator API misuse causing deprecation warnings
* OMAP5 HDMI fixes for DDC and AVI infoframe
* OMAP4 HDMI fix for CEC

* tag 'omapdrm-4.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
  drm/omap: include gpio/consumer.h where needed
  drm/omap: include linux/seq_file.h where needed
  Revert "drm/omap: no need to select OMAP2_DSS"
  drm/omap: Remove regulator API abuse
  OMAPDSS: HDMI5: Change DDC timings
  OMAPDSS: HDMI5: Fix AVI infoframe
  drm/omap: fix OMAP4 hdmi_core_powerdown_disable()
  drm/omap: Fix missing includes
  drm/omapdrm: include pinctrl/consumer.h where needed
parents b1602452 d0196c8d

drivers/gpu/drm/omapdrm/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -2,6 +2,7 @@ config DRM_OMAP 
	tristate "OMAP DRM"

	tristate "OMAP DRM"

	depends on DRM

	depends on DRM

	depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM

	depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM

	select OMAP2_DSS

	select DRM_KMS_HELPER

	select DRM_KMS_HELPER

	select DRM_KMS_FB_HELPER

	select DRM_KMS_FB_HELPER

	select FB_SYS_FILLRECT

	select FB_SYS_FILLRECT

drivers/gpu/drm/omapdrm/displays/connector-hdmi.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -9,6 +9,7 @@ 
 * the Free Software Foundation.

 * the Free Software Foundation.

 */

 */





#include <linux/gpio/consumer.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

drivers/gpu/drm/omapdrm/displays/encoder-opa362.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * the Free Software Foundation.

 * the Free Software Foundation.

 */

 */





#include <linux/gpio.h>

#include <linux/gpio/consumer.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/slab.h>

drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -9,7 +9,7 @@ 
 * the Free Software Foundation.

 * the Free Software Foundation.

 */

 */





#include <linux/gpio.h>

#include <linux/gpio/consumer.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/slab.h>

drivers/gpu/drm/omapdrm/displays/panel-dpi.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -9,7 +9,7 @@ 
 * the Free Software Foundation.

 * the Free Software Foundation.

 */

 */





#include <linux/gpio.h>

#include <linux/gpio/consumer.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/slab.h>