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

Commit 89747c91 authored by Bryan Wu's avatar Bryan Wu Committed by Tomi Valkeinen
Browse files

OMAP: use generic DPI panel driver in board files 



Still keep sharp_ls_panel, since the sharp_ls_panel driver contains blacklight
control driver code which will be moved out later. Then we can use generic DPI
driver for sharp_ls_panel.

Signed-off-by: default avatarBryan Wu <bryan.wu@canonical.com>
Acked-by: default avatarArchit Taneja <archit@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@nokia.com>
parent a9a62b6a

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

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

#include <plat/gpmc.h>

#include <plat/display.h>

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



#include <plat/gpmc-smc91x.h>
@@ -270,13 +271,18 @@ static struct omap_dss_device sdp3430_lcd_device = { 
	.platform_disable	= sdp3430_panel_disable_lcd,

};



static struct panel_generic_dpi_data dvi_panel = {

	.name			= "generic",

	.platform_enable	= sdp3430_panel_enable_dvi,

	.platform_disable	= sdp3430_panel_disable_dvi,

};



static struct omap_dss_device sdp3430_dvi_device = {

	.name			= "dvi",

	.driver_name		= "generic_panel",

	.type			= OMAP_DISPLAY_TYPE_DPI,

	.driver_name		= "generic_dpi_panel",

	.data			= &dvi_panel,

	.phy.dpi.data_lines	= 24,

	.platform_enable	= sdp3430_panel_enable_dvi,

	.platform_disable	= sdp3430_panel_disable_dvi,

};



static struct omap_dss_device sdp3430_tv_device = {

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

+17 −6
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <plat/common.h>

#include <plat/usb.h>

#include <plat/display.h>

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



#include "mux.h"

#include "control.h"
@@ -303,13 +304,18 @@ static void am3517_evm_panel_disable_lcd(struct omap_dss_device *dssdev) 
	lcd_enabled = 0;

}



static struct panel_generic_dpi_data lcd_panel = {

	.name			= "sharp_lq",

	.platform_enable	= am3517_evm_panel_enable_lcd,

	.platform_disable	= am3517_evm_panel_disable_lcd,

};



static struct omap_dss_device am3517_evm_lcd_device = {

	.type			= OMAP_DISPLAY_TYPE_DPI,

	.name			= "lcd",

	.driver_name		= "sharp_lq_panel",

	.driver_name		= "generic_dpi_panel",

	.data			= &lcd_panel,

	.phy.dpi.data_lines 	= 16,

	.platform_enable	= am3517_evm_panel_enable_lcd,

	.platform_disable	= am3517_evm_panel_disable_lcd,

};



static int am3517_evm_panel_enable_tv(struct omap_dss_device *dssdev)
@@ -346,13 +352,18 @@ 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",

	.platform_enable	= am3517_evm_panel_enable_dvi,

	.platform_disable	= am3517_evm_panel_disable_dvi,

};



static struct omap_dss_device am3517_evm_dvi_device = {

	.type			= OMAP_DISPLAY_TYPE_DPI,

	.name			= "dvi",

	.driver_name		= "generic_panel",

	.driver_name		= "generic_dpi_panel",

	.data			= &dvi_panel,

	.phy.dpi.data_lines	= 24,

	.platform_enable	= am3517_evm_panel_enable_dvi,

	.platform_disable	= am3517_evm_panel_disable_dvi,

};



static struct omap_dss_device *am3517_evm_dss_devices[] = {

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

+17 −6
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include <plat/gpmc.h>

#include <plat/usb.h>

#include <plat/display.h>

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

#include <plat/mcspi.h>



#include <mach/hardware.h>
@@ -351,22 +352,32 @@ static void cm_t35_panel_disable_tv(struct omap_dss_device *dssdev) 
{

}



static struct panel_generic_dpi_data lcd_panel = {

	.name			= "toppoly_tdo35s",

	.platform_enable	= cm_t35_panel_enable_lcd,

	.platform_disable	= cm_t35_panel_disable_lcd,

};



static struct omap_dss_device cm_t35_lcd_device = {

	.name			= "lcd",

	.driver_name		= "toppoly_tdo35s_panel",

	.type			= OMAP_DISPLAY_TYPE_DPI,

	.driver_name		= "generic_dpi_panel",

	.data			= &lcd_panel,

	.phy.dpi.data_lines	= 18,

	.platform_enable	= cm_t35_panel_enable_lcd,

	.platform_disable	= cm_t35_panel_disable_lcd,

};



static struct panel_generic_dpi_data dvi_panel = {

	.name			= "generic",

	.platform_enable	= cm_t35_panel_enable_dvi,

	.platform_disable	= cm_t35_panel_disable_dvi,

};



static struct omap_dss_device cm_t35_dvi_device = {

	.name			= "dvi",

	.driver_name		= "generic_panel",

	.type			= OMAP_DISPLAY_TYPE_DPI,

	.driver_name		= "generic_dpi_panel",

	.data			= &dvi_panel,

	.phy.dpi.data_lines	= 24,

	.platform_enable	= cm_t35_panel_enable_dvi,

	.platform_disable	= cm_t35_panel_disable_dvi,

};



static struct omap_dss_device cm_t35_tv_device = {

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

+18 −8
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include <plat/nand.h>

#include <plat/usb.h>

#include <plat/display.h>

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



#include <plat/mcspi.h>

#include <linux/input/matrix_keypad.h>
@@ -149,23 +150,32 @@ static struct regulator_consumer_supply devkit8000_vmmc1_supply = 
static struct regulator_consumer_supply devkit8000_vio_supply =

	REGULATOR_SUPPLY("vcc", "spi2.0");



static struct panel_generic_dpi_data lcd_panel = {

	.name			= "generic",

	.platform_enable        = devkit8000_panel_enable_lcd,

	.platform_disable       = devkit8000_panel_disable_lcd,

};



static struct omap_dss_device devkit8000_lcd_device = {

	.name                   = "lcd",

	.driver_name            = "generic_panel",

	.type                   = OMAP_DISPLAY_TYPE_DPI,

	.driver_name            = "generic_dpi_panel",

	.data			= &lcd_panel,

	.phy.dpi.data_lines     = 24,

	.reset_gpio             = -EINVAL, /* will be replaced */

	.platform_enable        = devkit8000_panel_enable_lcd,

	.platform_disable       = devkit8000_panel_disable_lcd,

};



static struct panel_generic_dpi_data dvi_panel = {

	.name			= "generic",

	.platform_enable        = devkit8000_panel_enable_dvi,

	.platform_disable       = devkit8000_panel_disable_dvi,

};



static struct omap_dss_device devkit8000_dvi_device = {

	.name                   = "dvi",

	.driver_name            = "generic_panel",

	.type                   = OMAP_DISPLAY_TYPE_DPI,

	.driver_name            = "generic_dpi_panel",

	.data			= &dvi_panel,

	.phy.dpi.data_lines     = 24,

	.reset_gpio             = -EINVAL, /* will be replaced */

	.platform_enable        = devkit8000_panel_enable_dvi,

	.platform_disable       = devkit8000_panel_disable_dvi,

};



static struct omap_dss_device devkit8000_tv_device = {

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

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

#include <plat/usb.h>

#include <plat/display.h>

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

#include <plat/onenand.h>



#include "mux.h"
@@ -459,13 +460,18 @@ 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",

	.platform_enable	= igep2_enable_dvi,

	.platform_disable	= igep2_disable_dvi,

};



static struct omap_dss_device igep2_dvi_device = {

	.type			= OMAP_DISPLAY_TYPE_DPI,

	.name			= "dvi",

	.driver_name		= "generic_panel",

	.driver_name		= "generic_dpi_panel",

	.data			= &dvi_panel,

	.phy.dpi.data_lines	= 24,

	.platform_enable	= igep2_enable_dvi,

	.platform_disable	= igep2_disable_dvi,

};



static struct omap_dss_device *igep2_dss_devices[] = {