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

Commit 3a5b27bf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://gitorious.org/linux-omap-dss2/linux: (49 commits)
  OMAP: DSS2: Taal: Fix TE when resuming
  OMAP: DSS2: Taal: Fix ESD check
  OMAP: DSS2: OMAPFB: Constify some function parameters
  OMAP: DSS2: OMAPFB: install omapfb.h
  OMAP: DSS2: DSI: add error prints
  OMAP: DSS2: TPO-TD03MTEA1: fix function names
  OMAP: DSS2: DSI: add dsi_vc_dcs_read_2() helper
  OMAP: DSS2: OMAPFB: Remove FB_OMAP2_FORCE_AUTO_UPDATE
  OMAP: DSS2: DSI: remove external TE support
  OMAP: DSS2: move timing functions
  OMAP: DSS2: move set/get_wss()
  OMAP: DSS2: move enable/disable/suspend/resume
  OMAP: DSS2: move update() and sync()
  OMAP: DSS2: move set/get_update_mode()
  OMAP: DSS2: move enable/get_te()
  OMAP: DSS2: move get_recommended_bpp()
  OMAP: DSS2: move get_resolution()
  OMAP: DSS2: move enable/disable_channel to overlay manager
  OMAP: DSS2: move wait_vsync()
  OMAP: DSS2: move get/set_rotate()
  ...
parents 5057bfaf 21df20fc

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

+0 −4
Original line number Diff line number Diff line
@@ -541,10 +541,6 @@ static struct regulator_init_data sdp3430_vdac = { 


/* VPLL2 for digital video outputs */

static struct regulator_consumer_supply sdp3430_vpll2_supplies[] = {

	{

		.supply		= "vdvi",

		.dev		= &sdp3430_lcd_device.dev,

	},

	{

		.supply		= "vdds_dsi",

		.dev		= &sdp3430_dss_device.dev,

arch/arm/plat-omap/include/plat/display.h

+66 −51
Original line number Diff line number Diff line
@@ -233,8 +233,12 @@ int omap_rfbi_setup_te(enum omap_rfbi_te_mode mode, 
void dsi_bus_lock(void);

void dsi_bus_unlock(void);

int dsi_vc_dcs_write(int channel, u8 *data, int len);

int dsi_vc_dcs_write_0(int channel, u8 dcs_cmd);

int dsi_vc_dcs_write_1(int channel, u8 dcs_cmd, u8 param);

int dsi_vc_dcs_write_nosync(int channel, u8 *data, int len);

int dsi_vc_dcs_read(int channel, u8 dcs_cmd, u8 *buf, int buflen);

int dsi_vc_dcs_read_1(int channel, u8 dcs_cmd, u8 *data);

int dsi_vc_dcs_read_2(int channel, u8 dcs_cmd, u16 *data);

int dsi_vc_set_max_rx_packet_size(int channel, u16 len);

int dsi_vc_send_null(int channel);

int dsi_vc_send_bta_sync(int channel);
@@ -367,6 +371,10 @@ struct omap_overlay_manager { 


	int (*apply)(struct omap_overlay_manager *mgr);

	int (*wait_for_go)(struct omap_overlay_manager *mgr);

	int (*wait_for_vsync)(struct omap_overlay_manager *mgr);



	int (*enable)(struct omap_overlay_manager *mgr);

	int (*disable)(struct omap_overlay_manager *mgr);

};



struct omap_dss_device {
@@ -426,16 +434,11 @@ struct omap_dss_device { 
		int acb;	/* ac-bias pin frequency */



		enum omap_panel_config config;



		u8 recommended_bpp;



		struct omap_dss_device *ctrl;

	} panel;



	struct {

		u8 pixel_size;

		struct rfbi_timings rfbi_timings;

		struct omap_dss_device *panel;

	} ctrl;



	int reset_gpio;
@@ -460,49 +463,6 @@ struct omap_dss_device { 


	enum omap_dss_display_state state;



	int (*enable)(struct omap_dss_device *dssdev);

	void (*disable)(struct omap_dss_device *dssdev);



	int (*suspend)(struct omap_dss_device *dssdev);

	int (*resume)(struct omap_dss_device *dssdev);



	void (*get_resolution)(struct omap_dss_device *dssdev,

			u16 *xres, u16 *yres);

	int (*get_recommended_bpp)(struct omap_dss_device *dssdev);



	int (*check_timings)(struct omap_dss_device *dssdev,

			struct omap_video_timings *timings);

	void (*set_timings)(struct omap_dss_device *dssdev,

			struct omap_video_timings *timings);

	void (*get_timings)(struct omap_dss_device *dssdev,

			struct omap_video_timings *timings);

	int (*update)(struct omap_dss_device *dssdev,

			       u16 x, u16 y, u16 w, u16 h);

	int (*sync)(struct omap_dss_device *dssdev);

	int (*wait_vsync)(struct omap_dss_device *dssdev);



	int (*set_update_mode)(struct omap_dss_device *dssdev,

			enum omap_dss_update_mode);

	enum omap_dss_update_mode (*get_update_mode)

		(struct omap_dss_device *dssdev);



	int (*enable_te)(struct omap_dss_device *dssdev, bool enable);

	int (*get_te)(struct omap_dss_device *dssdev);



	u8 (*get_rotate)(struct omap_dss_device *dssdev);

	int (*set_rotate)(struct omap_dss_device *dssdev, u8 rotate);



	bool (*get_mirror)(struct omap_dss_device *dssdev);

	int (*set_mirror)(struct omap_dss_device *dssdev, bool enable);



	int (*run_test)(struct omap_dss_device *dssdev, int test);

	int (*memory_read)(struct omap_dss_device *dssdev,

			void *buf, size_t size,

			u16 x, u16 y, u16 w, u16 h);



	int (*set_wss)(struct omap_dss_device *dssdev, u32 wss);

	u32 (*get_wss)(struct omap_dss_device *dssdev);



	/* platform specific  */

	int (*platform_enable)(struct omap_dss_device *dssdev);

	void (*platform_disable)(struct omap_dss_device *dssdev);
@@ -522,11 +482,17 @@ struct omap_dss_driver { 
	int (*resume)(struct omap_dss_device *display);

	int (*run_test)(struct omap_dss_device *display, int test);



	void (*setup_update)(struct omap_dss_device *dssdev,

	int (*set_update_mode)(struct omap_dss_device *dssdev,

			enum omap_dss_update_mode);

	enum omap_dss_update_mode (*get_update_mode)(

			struct omap_dss_device *dssdev);



	int (*update)(struct omap_dss_device *dssdev,

			       u16 x, u16 y, u16 w, u16 h);

	int (*sync)(struct omap_dss_device *dssdev);



	int (*enable_te)(struct omap_dss_device *dssdev, bool enable);

	int (*wait_for_te)(struct omap_dss_device *dssdev);

	int (*get_te)(struct omap_dss_device *dssdev);



	u8 (*get_rotate)(struct omap_dss_device *dssdev);

	int (*set_rotate)(struct omap_dss_device *dssdev, u8 rotate);
@@ -537,6 +503,20 @@ struct omap_dss_driver { 
	int (*memory_read)(struct omap_dss_device *dssdev,

			void *buf, size_t size,

			u16 x, u16 y, u16 w, u16 h);



	void (*get_resolution)(struct omap_dss_device *dssdev,

			u16 *xres, u16 *yres);

	int (*get_recommended_bpp)(struct omap_dss_device *dssdev);



	int (*check_timings)(struct omap_dss_device *dssdev,

			struct omap_video_timings *timings);

	void (*set_timings)(struct omap_dss_device *dssdev,

			struct omap_video_timings *timings);

	void (*get_timings)(struct omap_dss_device *dssdev,

			struct omap_video_timings *timings);



	int (*set_wss)(struct omap_dss_device *dssdev, u32 wss);

	u32 (*get_wss)(struct omap_dss_device *dssdev);

};



int omap_dss_register_driver(struct omap_dss_driver *);
@@ -561,6 +541,10 @@ struct omap_overlay_manager *omap_dss_get_overlay_manager(int num); 
int omap_dss_get_num_overlays(void);

struct omap_overlay *omap_dss_get_overlay(int num);



void omapdss_default_get_resolution(struct omap_dss_device *dssdev,

		u16 *xres, u16 *yres);

int omapdss_default_get_recommended_bpp(struct omap_dss_device *dssdev);



typedef void (*omap_dispc_isr_t) (void *arg, u32 mask);

int omap_dispc_register_isr(omap_dispc_isr_t isr, void *arg, u32 mask);

int omap_dispc_unregister_isr(omap_dispc_isr_t isr, void *arg, u32 mask);
@@ -572,4 +556,35 @@ int omap_dispc_wait_for_irq_interruptible_timeout(u32 irqmask, 
#define to_dss_driver(x) container_of((x), struct omap_dss_driver, driver)

#define to_dss_device(x) container_of((x), struct omap_dss_device, dev)



void omapdss_dsi_vc_enable_hs(int channel, bool enable);

int omapdss_dsi_enable_te(struct omap_dss_device *dssdev, bool enable);



int omap_dsi_prepare_update(struct omap_dss_device *dssdev,

				    u16 *x, u16 *y, u16 *w, u16 *h);

int omap_dsi_update(struct omap_dss_device *dssdev,

		int channel,

		u16 x, u16 y, u16 w, u16 h,

		void (*callback)(int, void *), void *data);



int omapdss_dsi_display_enable(struct omap_dss_device *dssdev);

void omapdss_dsi_display_disable(struct omap_dss_device *dssdev);



int omapdss_dpi_display_enable(struct omap_dss_device *dssdev);

void omapdss_dpi_display_disable(struct omap_dss_device *dssdev);

void dpi_set_timings(struct omap_dss_device *dssdev,

			struct omap_video_timings *timings);

int dpi_check_timings(struct omap_dss_device *dssdev,

			struct omap_video_timings *timings);



int omapdss_sdi_display_enable(struct omap_dss_device *dssdev);

void omapdss_sdi_display_disable(struct omap_dss_device *dssdev);



int omapdss_rfbi_display_enable(struct omap_dss_device *dssdev);

void omapdss_rfbi_display_disable(struct omap_dss_device *dssdev);

int omap_rfbi_prepare_update(struct omap_dss_device *dssdev,

		u16 *x, u16 *y, u16 *w, u16 *h);

int omap_rfbi_update(struct omap_dss_device *dssdev,

		u16 x, u16 y, u16 w, u16 h,

		void (*callback)(void *), void *data);



#endif

drivers/video/omap/lcd_ams_delta.c

+89 −4
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/platform_device.h>

#include <linux/io.h>

#include <linux/delay.h>

#include <linux/lcd.h>



#include <plat/board-ams-delta.h>

#include <mach/hardware.h>
@@ -32,6 +33,71 @@ 


#define AMS_DELTA_DEFAULT_CONTRAST	112



#define AMS_DELTA_MAX_CONTRAST		0x00FF

#define AMS_DELTA_LCD_POWER		0x0100





/* LCD class device section */



static int ams_delta_lcd;



static int ams_delta_lcd_set_power(struct lcd_device *dev, int power)

{

	if (power == FB_BLANK_UNBLANK) {

		if (!(ams_delta_lcd & AMS_DELTA_LCD_POWER)) {

			omap_writeb(ams_delta_lcd & AMS_DELTA_MAX_CONTRAST,

					OMAP_PWL_ENABLE);

			omap_writeb(1, OMAP_PWL_CLK_ENABLE);

			ams_delta_lcd |= AMS_DELTA_LCD_POWER;

		}

	} else {

		if (ams_delta_lcd & AMS_DELTA_LCD_POWER) {

			omap_writeb(0, OMAP_PWL_ENABLE);

			omap_writeb(0, OMAP_PWL_CLK_ENABLE);

			ams_delta_lcd &= ~AMS_DELTA_LCD_POWER;

		}

	}

	return 0;

}



static int ams_delta_lcd_set_contrast(struct lcd_device *dev, int value)

{

	if ((value >= 0) && (value <= AMS_DELTA_MAX_CONTRAST)) {

		omap_writeb(value, OMAP_PWL_ENABLE);

		ams_delta_lcd &= ~AMS_DELTA_MAX_CONTRAST;

		ams_delta_lcd |= value;

	}

	return 0;

}



#ifdef CONFIG_LCD_CLASS_DEVICE

static int ams_delta_lcd_get_power(struct lcd_device *dev)

{

	if (ams_delta_lcd & AMS_DELTA_LCD_POWER)

		return FB_BLANK_UNBLANK;

	else

		return FB_BLANK_POWERDOWN;

}



static int ams_delta_lcd_get_contrast(struct lcd_device *dev)

{

	if (!(ams_delta_lcd & AMS_DELTA_LCD_POWER))

		return 0;



	return ams_delta_lcd & AMS_DELTA_MAX_CONTRAST;

}



static struct lcd_ops ams_delta_lcd_ops = {

	.get_power = ams_delta_lcd_get_power,

	.set_power = ams_delta_lcd_set_power,

	.get_contrast = ams_delta_lcd_get_contrast,

	.set_contrast = ams_delta_lcd_set_contrast,

};

#endif





/* omapfb panel section */



static int ams_delta_panel_init(struct lcd_panel *panel,

		struct omapfb_device *fbdev)

{
@@ -48,10 +114,6 @@ static int ams_delta_panel_enable(struct lcd_panel *panel) 
			AMS_DELTA_LATCH2_LCD_NDISP);

	ams_delta_latch2_write(AMS_DELTA_LATCH2_LCD_VBLEN,

			AMS_DELTA_LATCH2_LCD_VBLEN);



	omap_writeb(1, OMAP_PWL_CLK_ENABLE);

	omap_writeb(AMS_DELTA_DEFAULT_CONTRAST, OMAP_PWL_ENABLE);



	return 0;

}
@@ -91,8 +153,31 @@ static struct lcd_panel ams_delta_panel = { 
	.get_caps	= ams_delta_panel_get_caps,

};





/* platform driver section */



static int ams_delta_panel_probe(struct platform_device *pdev)

{

	struct lcd_device *lcd_device = NULL;

#ifdef CONFIG_LCD_CLASS_DEVICE

	int ret;



	lcd_device = lcd_device_register("omapfb", &pdev->dev, NULL,

						&ams_delta_lcd_ops);



	if (IS_ERR(lcd_device)) {

		ret = PTR_ERR(lcd_device);

		dev_err(&pdev->dev, "failed to register device\n");

		return ret;

	}



	platform_set_drvdata(pdev, lcd_device);

	lcd_device->props.max_contrast = AMS_DELTA_MAX_CONTRAST;

#endif



	ams_delta_lcd_set_contrast(lcd_device, AMS_DELTA_DEFAULT_CONTRAST);

	ams_delta_lcd_set_power(lcd_device, FB_BLANK_UNBLANK);



	omapfb_register_panel(&ams_delta_panel);

	return 0;

}

drivers/video/omap/omapfb_main.c

+4 −3
Original line number Diff line number Diff line
@@ -486,9 +486,10 @@ static int set_color_mode(struct omapfb_plane_struct *plane, 
		return 0;

	case 12:

		var->bits_per_pixel = 16;

		plane->color_mode = OMAPFB_COLOR_RGB444;

		return 0;

	case 16:

		if (plane->fbdev->panel->bpp == 12)

			plane->color_mode = OMAPFB_COLOR_RGB444;

		else

			plane->color_mode = OMAPFB_COLOR_RGB565;

		return 0;

	default:

drivers/video/omap2/displays/Kconfig

+18 −0
Original line number Diff line number Diff line
@@ -13,10 +13,28 @@ config PANEL_SHARP_LS037V7DW01 
        help

          LCD Panel used in TI's SDP3430 and EVM boards



config PANEL_SHARP_LQ043T1DG01

        tristate "Sharp LQ043T1DG01 LCD Panel"

        depends on OMAP2_DSS

        help

          LCD Panel used in TI's OMAP3517 EVM boards



config PANEL_TAAL

        tristate "Taal DSI Panel"

        depends on OMAP2_DSS_DSI

        help

          Taal DSI command mode panel from TPO.



config PANEL_TOPPOLY_TDO35S

        tristate "Toppoly TDO35S LCD Panel support"

        depends on OMAP2_DSS

        help

          LCD Panel used in CM-T35



config PANEL_TPO_TD043MTEA1

        tristate "TPO TD043MTEA1 LCD Panel"

        depends on OMAP2_DSS && I2C

        help

          LCD Panel used in OMAP3 Pandora



endmenu