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

Commit 537d8478 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: (64 commits)
  OMAP: DSS2: OMAPFB: add support for FBIO_WAITFORVSYNC
  OMAP: DSS2: Replace strncmp() with sysfs_streq() in overlay_manager_store()
  OMAP: DSS2: Fix error path in omap_dsi_update()
  OMAP: DSS2: TDO35S: fix video signaling
  OMAP: DSS2: OMAPFB: Fix invalid bpp for PAL and NTSC modes
  OMAP: DSS2: OMAPFB: Fix probe error path
  OMAP3EVM: Replace vdvi regulator supply with vdds_dsi
  OMAP: DSS2: Remove extra return statement
  OMAP: DSS2: adjust YUV overlay width to be even
  OMAP: DSS2: OMAPFB: Fix sysfs mirror input check
  OMAP: DSS2: OMAPFB: Remove redundant color register range check
  OMAP: DSS2: OMAPFB: Remove redundant rotate range check
  OMAP: DSS2: OMAPFB: Check fb2display() return value
  OMAP: DSS2: Taal: Optimize enable_te, rotate, mirror when value unchanged
  OMAP: DSS2: DSI: detect unsupported update requests
  OMAP: DSS2: DSI: increase FIFO low threshold
  OMAP: DSS2: DSI: Add error IRQ mask for DSI complexIO
  OMAP: DSS2: DSI: Remove BTA after set_max_rx_packet_size
  OMAP: DSS2: change manual update scaling setup
  OMAP: DSS2: DSI: use BTA to end the frame transfer
  ...
parents d71048e2 ece350d3

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

+2 −5
Original line number Diff line number Diff line
@@ -514,14 +514,11 @@ static struct regulator_init_data omap3_evm_vdac = { 
};



/* VPLL2 for digital video outputs */

static struct regulator_consumer_supply omap3_evm_vpll2_supply = {

	.supply		= "vdvi",

	.dev		= &omap3_evm_lcd_device.dev,

};

static struct regulator_consumer_supply omap3_evm_vpll2_supply =

	REGULATOR_SUPPLY("vdds_dsi", "omapdss");



static struct regulator_init_data omap3_evm_vpll2 = {

	.constraints = {

		.name			= "VDVI",

		.min_uV			= 1800000,

		.max_uV			= 1800000,

		.apply_uV		= true,

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

+5 −4
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ 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_dcs_read_2(int channel, u8 dcs_cmd, u8 *data1, u8 *data2);

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);
@@ -277,8 +277,8 @@ struct omap_video_timings { 
 * identify the mode, and does not actually use the configs

 * itself. However, the configs should be something that

 * a normal monitor can also show */

const extern struct omap_video_timings omap_dss_pal_timings;

const extern struct omap_video_timings omap_dss_ntsc_timings;

extern const struct omap_video_timings omap_dss_pal_timings;

extern const struct omap_video_timings omap_dss_ntsc_timings;

#endif



struct omap_overlay_info {
@@ -560,7 +560,8 @@ 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);

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

				    bool enlarge_update_area);

int omap_dsi_update(struct omap_dss_device *dssdev,

		int channel,

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

arch/arm/plat-omap/include/plat/nokia-dsi-panel.h

0 → 100644
+31 −0
Original line number Diff line number Diff line 
#ifndef __ARCH_ARM_PLAT_OMAP_NOKIA_DSI_PANEL_H

#define __ARCH_ARM_PLAT_OMAP_NOKIA_DSI_PANEL_H



#include "display.h"



/**

 * struct nokia_dsi_panel_data - Nokia DSI panel driver configuration

 * @name: panel name

 * @use_ext_te: use external TE

 * @ext_te_gpio: external TE GPIO

 * @use_esd_check: perform ESD checks

 * @max_backlight_level: maximum backlight level

 * @set_backlight: pointer to backlight set function

 * @get_backlight: pointer to backlight get function

 */

struct nokia_dsi_panel_data {

	const char *name;



	int reset_gpio;



	bool use_ext_te;

	int ext_te_gpio;



	bool use_esd_check;



	int max_backlight_level;

	int (*set_backlight)(struct omap_dss_device *dssdev, int level);

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

};



#endif /* __ARCH_ARM_PLAT_OMAP_NOKIA_DSI_PANEL_H */

drivers/video/omap2/displays/panel-taal.c

+447 −120

File changed.

Preview size limit exceeded, changes collapsed.

drivers/video/omap2/displays/panel-toppoly-tdo35s.c

+6 −2
Original line number Diff line number Diff line
@@ -73,8 +73,12 @@ static void toppoly_tdo_panel_power_off(struct omap_dss_device *dssdev) 


static int toppoly_tdo_panel_probe(struct omap_dss_device *dssdev)

{

	dssdev->panel.config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |

		OMAP_DSS_LCD_IHS;

	dssdev->panel.config = OMAP_DSS_LCD_TFT |

			       OMAP_DSS_LCD_IVS |

			       OMAP_DSS_LCD_IHS |

			       OMAP_DSS_LCD_IPC |

			       OMAP_DSS_LCD_ONOFF;



	dssdev->panel.timings = toppoly_tdo_panel_timings;



	return 0;