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

Commit a6b5825a authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux 



Conflicts:
	drivers/video/omap2/dss/dsi.c
	drivers/video/omap2/dss/dss_features.c
	drivers/video/omap2/dss/dss_features.h

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parents 9fb4c7fb 0d66cbb5

arch/arm/mach-omap2/board-3430sdp.c

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ 
#include <plat/common.h>

#include <plat/dma.h>

#include <plat/gpmc.h>

#include <plat/display.h>

#include <plat/panel-generic-dpi.h>

#include <video/omapdss.h>

#include <video/omap-panel-generic-dpi.h>



#include <plat/gpmc-smc91x.h>

arch/arm/mach-omap2/board-4430sdp.c

+10 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include <plat/usb.h>

#include <plat/mmc.h>

#include <plat/omap4-keypad.h>

#include <plat/display.h>

#include <video/omapdss.h>



#include "mux.h"

#include "hsmmc.h"
@@ -680,6 +680,15 @@ static struct omap_dss_device sdp4430_hdmi_device = { 
	.name = "hdmi",

	.driver_name = "hdmi_panel",

	.type = OMAP_DISPLAY_TYPE_HDMI,

	.clocks	= {

		.dispc	= {

			.dispc_fclk_src	= OMAP_DSS_CLK_SRC_FCK,

		},

		.hdmi	= {

			.regn	= 15,

			.regm2	= 1,

		},

	},

	.platform_enable = sdp4430_panel_enable_hdmi,

	.platform_disable = sdp4430_panel_disable_hdmi,

	.channel = OMAP_DSS_CHANNEL_DIGIT,

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

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ 
#include <plat/board.h>

#include <plat/common.h>

#include <plat/usb.h>

#include <plat/display.h>

#include <plat/panel-generic-dpi.h>

#include <video/omapdss.h>

#include <video/omap-panel-generic-dpi.h>



#include "mux.h"

#include "control.h"

arch/arm/mach-omap2/board-cm-t35.c

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ 
#include <plat/nand.h>

#include <plat/gpmc.h>

#include <plat/usb.h>

#include <plat/display.h>

#include <plat/panel-generic-dpi.h>

#include <video/omapdss.h>

#include <video/omap-panel-generic-dpi.h>

#include <plat/mcspi.h>



#include <mach/hardware.h>

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

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ 
#include <plat/gpmc.h>

#include <plat/nand.h>

#include <plat/usb.h>

#include <plat/display.h>

#include <plat/panel-generic-dpi.h>

#include <video/omapdss.h>

#include <video/omap-panel-generic-dpi.h>



#include <plat/mcspi.h>

#include <linux/input/matrix_keypad.h>