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

Commit 68ada6bd authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'peter/for-4.8_omapdss_part1' of... 

Merge branch 'peter/for-4.8_omapdss_part1' of https://github.com/omap-audio/linux-audio into omap-for-v4.8/soc
parents 1a695a90 f8e0db97

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"

arch/arm/mach-omap2/display.h

+5 −0
Original line number Diff line number Diff line
@@ -33,4 +33,9 @@ int omap_init_vout(void); 


struct device_node * __init omapdss_find_dss_of_node(void);



struct omap_dss_board_info;



/* Init with the board info */

int omap_display_init(struct omap_dss_board_info *board_data);



#endif

arch/arm/mach-omap2/dss-common.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <linux/gpio.h>

#include <linux/platform_device.h>



#include <video/omapdss.h>

#include <linux/platform_data/omapdss.h>

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



#include "soc.h"