Merge tag 'fix-missing-panels' into fixes

diff --cc arch/arm/boot/dts/am33xx-l4.dtsi
Simple merge

diff --cc arch/arm/boot/dts/dra7-l4.dtsi
Simple merge

diff --cc arch/arm/boot/dts/omap3-gta04.dtsi
Simple merge

diff --cc arch/arm/configs/omap2plus_defconfig
index ae326572c62a69c0d3a304bd7f578ef8f00b8fef,b647e463b9c7ade03c4ea7f53951339c68320b7a..4e7db259d6dc4cda34e4565b44d40956e54c64ac
--- 1/arch/arm/configs/omap2plus_defconfig
--- 2/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@@ -356,15 -356,14 +356,15 @@@ CONFIG_DRM_OMAP_CONNECTOR_HDMI=
  CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV=m
  CONFIG_DRM_OMAP_PANEL_DPI=m
  CONFIG_DRM_OMAP_PANEL_DSI_CM=m
- CONFIG_DRM_OMAP_PANEL_SONY_ACX565AKM=m
- CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q02=m
- CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01=m
- CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1=m
- CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1=m
- CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11=m
  CONFIG_DRM_TILCDC=m
  CONFIG_DRM_PANEL_SIMPLE=m
 +CONFIG_DRM_TI_TFP410=m
+ CONFIG_DRM_PANEL_LG_LB035Q02=m
+ CONFIG_DRM_PANEL_NEC_NL8048HL11=m
+ CONFIG_DRM_PANEL_SHARP_LS037V7DW01=m
+ CONFIG_DRM_PANEL_SONY_ACX565AKM=m
+ CONFIG_DRM_PANEL_TPO_TD028TTEC1=m
+ CONFIG_DRM_PANEL_TPO_TD043MTEA1=m
  CONFIG_FB=y
  CONFIG_FIRMWARE_EDID=y
  CONFIG_FB_MODE_HELPERS=y

diff --cc arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_33xx_data.c
Simple merge