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

Commit d33a6291 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6: (29 commits)
  video: move SH_MIPI_DSI/SH_LCD_MIPI_DSI to the top of menu
  fbdev: Implement simple blanking in pseudocolor modes for vt8500lcdfb
  video: imx: Update the manufacturer's name
  nuc900fb: don't treat NULL clk as an error
  s3c2410fb: don't treat NULL clk as an error
  video: tidy up modedb formatting.
  video: matroxfb: Correct video option in comments and kernel config help.
  fbdev: sh_mobile_hdmi: simplify pointer handling
  fbdev: sh_mobile_hdmi: framebuffer notifiers have to be registered
  fbdev: sh_mobile_hdmi: add command line option to use the preferred EDID mode
  OMAP: DSS2: Introduce omap_channel as an omap_dss_device parameter, add new overlay manager.
  OMAP: DSS2: Use dss_features to handle DISPC bits removed on OMAP4
  OMAP: DSS2: LCD2 Channel Changes for DISPC
  OMAP: DSS2: Change remaining DISPC functions for new omap_channel argument
  OMAP: DSS2: Introduce omap_channel argument to DISPC functions used by interface drivers
  OMAP: DSS2: Represent DISPC register defines with channel as parameter
  OMAP: DSS2: Add dss_features for omap4 and overlay manager related features
  OMAP: DSS2: Clean up DISPC color mode validation checks
  OMAP: DSS2: Add back authors of panel-generic.c based drivers
  OMAP: DSS2: remove generic DPI panel driver duplicated panel drivers
  ...
parents 66dc918d f00117a7

arch/arm/mach-omap2/Makefile

+3 −0
Original line number Original line Diff line number Diff line
@@ -187,16 +187,19 @@ obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \ 
					   hsmmc.o

					   hsmmc.o

obj-$(CONFIG_MACH_OMAP_ZOOM2)		+= board-zoom.o \

obj-$(CONFIG_MACH_OMAP_ZOOM2)		+= board-zoom.o \

					   board-zoom-peripherals.o \

					   board-zoom-peripherals.o \

					   board-zoom-display.o \

					   board-flash.o \

					   board-flash.o \

					   hsmmc.o \

					   hsmmc.o \

					   board-zoom-debugboard.o

					   board-zoom-debugboard.o

obj-$(CONFIG_MACH_OMAP_ZOOM3)		+= board-zoom.o \

obj-$(CONFIG_MACH_OMAP_ZOOM3)		+= board-zoom.o \

					   board-zoom-peripherals.o \

					   board-zoom-peripherals.o \

					   board-zoom-display.o \

					   board-flash.o \

					   board-flash.o \

					   hsmmc.o \

					   hsmmc.o \

					   board-zoom-debugboard.o

					   board-zoom-debugboard.o

obj-$(CONFIG_MACH_OMAP_3630SDP)		+= board-3630sdp.o \

obj-$(CONFIG_MACH_OMAP_3630SDP)		+= board-3630sdp.o \

					   board-zoom-peripherals.o \

					   board-zoom-peripherals.o \

					   board-zoom-display.o \

					   board-flash.o \

					   board-flash.o \

					   hsmmc.o

					   hsmmc.o

obj-$(CONFIG_MACH_CM_T35)		+= board-cm-t35.o \

obj-$(CONFIG_MACH_CM_T35)		+= board-cm-t35.o \

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

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

#include <plat/dma.h>

#include <plat/gpmc.h>

#include <plat/gpmc.h>

#include <plat/display.h>

#include <plat/display.h>

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





#include <plat/gpmc-smc91x.h>

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

	.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 = {

static struct omap_dss_device sdp3430_dvi_device = {

	.name			= "dvi",

	.name			= "dvi",

	.driver_name		= "generic_panel",

	.type			= OMAP_DISPLAY_TYPE_DPI,

	.type			= OMAP_DISPLAY_TYPE_DPI,

	.driver_name		= "generic_dpi_panel",

	.data			= &dvi_panel,

	.phy.dpi.data_lines	= 24,

	.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 = {

static struct omap_dss_device sdp3430_tv_device = {

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -207,6 +207,7 @@ static void __init omap_sdp_init(void) 
{

{

	omap3_mux_init(board_mux, OMAP_PACKAGE_CBP);

	omap3_mux_init(board_mux, OMAP_PACKAGE_CBP);

	zoom_peripherals_init();

	zoom_peripherals_init();

	zoom_display_init();

	board_smc91x_init();

	board_smc91x_init();

	board_flash_init(sdp_flash_partitions, chip_sel_sdp);

	board_flash_init(sdp_flash_partitions, chip_sel_sdp);

	enable_board_wakeup_source();

	enable_board_wakeup_source();

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

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

#include <plat/common.h>

#include <plat/usb.h>

#include <plat/usb.h>

#include <plat/display.h>

#include <plat/display.h>

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





#include "mux.h"

#include "mux.h"

#include "control.h"

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

	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 = {

static struct omap_dss_device am3517_evm_lcd_device = {

	.type			= OMAP_DISPLAY_TYPE_DPI,

	.type			= OMAP_DISPLAY_TYPE_DPI,

	.name			= "lcd",

	.name			= "lcd",

	.driver_name		= "sharp_lq_panel",

	.driver_name		= "generic_dpi_panel",

	.data			= &lcd_panel,

	.phy.dpi.data_lines 	= 16,

	.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)

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;

	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 = {

static struct omap_dss_device am3517_evm_dvi_device = {

	.type			= OMAP_DISPLAY_TYPE_DPI,

	.type			= OMAP_DISPLAY_TYPE_DPI,

	.name			= "dvi",

	.name			= "dvi",

	.driver_name		= "generic_panel",

	.driver_name		= "generic_dpi_panel",

	.data			= &dvi_panel,

	.phy.dpi.data_lines	= 24,

	.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[] = {

static struct omap_dss_device *am3517_evm_dss_devices[] = {

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

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

#include <plat/gpmc.h>

#include <plat/usb.h>

#include <plat/usb.h>

#include <plat/display.h>

#include <plat/display.h>

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

#include <plat/mcspi.h>

#include <plat/mcspi.h>





#include <mach/hardware.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 = {

static struct omap_dss_device cm_t35_lcd_device = {

	.name			= "lcd",

	.name			= "lcd",

	.driver_name		= "toppoly_tdo35s_panel",

	.type			= OMAP_DISPLAY_TYPE_DPI,

	.type			= OMAP_DISPLAY_TYPE_DPI,

	.driver_name		= "generic_dpi_panel",

	.data			= &lcd_panel,

	.phy.dpi.data_lines	= 18,

	.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 = {

static struct omap_dss_device cm_t35_dvi_device = {

	.name			= "dvi",

	.name			= "dvi",

	.driver_name		= "generic_panel",

	.type			= OMAP_DISPLAY_TYPE_DPI,

	.type			= OMAP_DISPLAY_TYPE_DPI,

	.driver_name		= "generic_dpi_panel",

	.data			= &dvi_panel,

	.phy.dpi.data_lines	= 24,

	.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 = {

static struct omap_dss_device cm_t35_tv_device = {