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

Commit 1d7a8654 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAP: use dvi panel driver instead of generic-dpi 



Multiple OMAP3/4 boards have a DVI framer output. This patch makes the
boards use the new panel-dvi driver, instead of the panel-generic-dpi
driver.

Separate drivers for fixed size panels and DVI framer gives us cleaner
driver code.

Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent ba2eac9e

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

+3 −4
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include <plat/dma.h>

#include <plat/gpmc.h>

#include <video/omapdss.h>

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

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



#include <plat/gpmc-smc91x.h>
@@ -186,8 +186,7 @@ static struct omap_dss_device sdp3430_lcd_device = { 
	.platform_disable	= sdp3430_panel_disable_lcd,

};



static struct panel_generic_dpi_data dvi_panel = {

	.name			= "generic",

static struct panel_dvi_platform_data dvi_panel = {

	.platform_enable	= sdp3430_panel_enable_dvi,

	.platform_disable	= sdp3430_panel_disable_dvi,

};
@@ -195,7 +194,7 @@ static struct panel_generic_dpi_data dvi_panel = { 
static struct omap_dss_device sdp3430_dvi_device = {

	.name			= "dvi",

	.type			= OMAP_DISPLAY_TYPE_DPI,

	.driver_name		= "generic_dpi_panel",

	.driver_name		= "dvi",

	.data			= &dvi_panel,

	.phy.dpi.data_lines	= 24,

};

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

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

#include <video/omapdss.h>

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

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



#include "mux.h"

#include "control.h"
@@ -333,8 +334,7 @@ static void am3517_evm_panel_disable_dvi(struct omap_dss_device *dssdev) 
	dvi_enabled = 0;

}



static struct panel_generic_dpi_data dvi_panel = {

	.name			= "generic",

static struct panel_dvi_platform_data dvi_panel = {

	.platform_enable	= am3517_evm_panel_enable_dvi,

	.platform_disable	= am3517_evm_panel_disable_dvi,

};
@@ -342,7 +342,7 @@ static struct panel_generic_dpi_data dvi_panel = { 
static struct omap_dss_device am3517_evm_dvi_device = {

	.type			= OMAP_DISPLAY_TYPE_DPI,

	.name			= "dvi",

	.driver_name		= "generic_dpi_panel",

	.driver_name		= "dvi",

	.data			= &dvi_panel,

	.phy.dpi.data_lines	= 24,

};

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

+3 −3
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <plat/usb.h>

#include <video/omapdss.h>

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

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

#include <plat/mcspi.h>



#include <mach/hardware.h>
@@ -242,8 +243,7 @@ static struct omap_dss_device cm_t35_lcd_device = { 
	.phy.dpi.data_lines	= 18,

};



static struct panel_generic_dpi_data dvi_panel = {

	.name			= "generic",

static struct panel_dvi_platform_data dvi_panel = {

	.platform_enable	= cm_t35_panel_enable_dvi,

	.platform_disable	= cm_t35_panel_disable_dvi,

};
@@ -251,7 +251,7 @@ static struct panel_generic_dpi_data dvi_panel = { 
static struct omap_dss_device cm_t35_dvi_device = {

	.name			= "dvi",

	.type			= OMAP_DISPLAY_TYPE_DPI,

	.driver_name		= "generic_dpi_panel",

	.driver_name		= "dvi",

	.data			= &dvi_panel,

	.phy.dpi.data_lines	= 24,

};

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

+3 −3
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include <plat/usb.h>

#include <video/omapdss.h>

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

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



#include <plat/mcspi.h>

#include <linux/input/matrix_keypad.h>
@@ -152,8 +153,7 @@ static struct omap_dss_device devkit8000_lcd_device = { 
	.phy.dpi.data_lines     = 24,

};



static struct panel_generic_dpi_data dvi_panel = {

	.name			= "generic",

static struct panel_dvi_platform_data dvi_panel = {

	.platform_enable        = devkit8000_panel_enable_dvi,

	.platform_disable       = devkit8000_panel_disable_dvi,

};
@@ -161,7 +161,7 @@ static struct panel_generic_dpi_data dvi_panel = { 
static struct omap_dss_device devkit8000_dvi_device = {

	.name                   = "dvi",

	.type                   = OMAP_DISPLAY_TYPE_DPI,

	.driver_name            = "generic_dpi_panel",

	.driver_name            = "dvi",

	.data			= &dvi_panel,

	.phy.dpi.data_lines     = 24,

};

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

+3 −4
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include <plat/gpmc.h>

#include <plat/usb.h>

#include <video/omapdss.h>

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

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

#include <plat/onenand.h>



#include "mux.h"
@@ -455,8 +455,7 @@ static void igep2_disable_dvi(struct omap_dss_device *dssdev) 
	gpio_direction_output(IGEP2_GPIO_DVI_PUP, 0);

}



static struct panel_generic_dpi_data dvi_panel = {

	.name			= "generic",

static struct panel_dvi_platform_data dvi_panel = {

	.platform_enable	= igep2_enable_dvi,

	.platform_disable	= igep2_disable_dvi,

};
@@ -464,7 +463,7 @@ static struct panel_generic_dpi_data dvi_panel = { 
static struct omap_dss_device igep2_dvi_device = {

	.type			= OMAP_DISPLAY_TYPE_DPI,

	.name			= "dvi",

	.driver_name		= "generic_dpi_panel",

	.driver_name		= "dvi",

	.data			= &dvi_panel,

	.phy.dpi.data_lines	= 24,

};