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

Commit 01e77706 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:
  OMAP: DSS2: panel-generic: re-implement mode changing
  OMAP: DSS2: initialize dss clk sources properly
  OMAP: DSS2: VRAM: Fix early_param for vram
parents 1ff31056 8871d54b

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

+22 −0
Original line number Diff line number Diff line
@@ -116,6 +116,24 @@ static int generic_panel_resume(struct omap_dss_device *dssdev) 
	return 0;

}



static void generic_panel_set_timings(struct omap_dss_device *dssdev,

		struct omap_video_timings *timings)

{

	dpi_set_timings(dssdev, timings);

}



static void generic_panel_get_timings(struct omap_dss_device *dssdev,

		struct omap_video_timings *timings)

{

	*timings = dssdev->panel.timings;

}



static int generic_panel_check_timings(struct omap_dss_device *dssdev,

		struct omap_video_timings *timings)

{

	return dpi_check_timings(dssdev, timings);

}



static struct omap_dss_driver generic_driver = {

	.probe		= generic_panel_probe,

	.remove		= generic_panel_remove,
@@ -125,6 +143,10 @@ static struct omap_dss_driver generic_driver = { 
	.suspend	= generic_panel_suspend,

	.resume		= generic_panel_resume,



	.set_timings	= generic_panel_set_timings,

	.get_timings	= generic_panel_get_timings,

	.check_timings	= generic_panel_check_timings,



	.driver         = {

		.name   = "generic_panel",

		.owner  = THIS_MODULE,

drivers/video/omap2/dss/dss.c

+3 −0
Original line number Diff line number Diff line
@@ -590,6 +590,9 @@ int dss_init(bool skip_init) 
		}

	}



	dss.dsi_clk_source = DSS_SRC_DSS1_ALWON_FCLK;

	dss.dispc_clk_source = DSS_SRC_DSS1_ALWON_FCLK;



	dss_save_context();



	rev = dss_read_reg(DSS_REVISION);

drivers/video/omap2/vram.c

+6 −5
Original line number Diff line number Diff line
@@ -511,13 +511,14 @@ static u32 omap_vram_sdram_size __initdata; 
static u32 omap_vram_def_sdram_size __initdata;

static u32 omap_vram_def_sdram_start __initdata;



static void __init omap_vram_early_vram(char **p)

static int __init omap_vram_early_vram(char *p)

{

	omap_vram_def_sdram_size = memparse(*p, p);

	if (**p == ',')

		omap_vram_def_sdram_start = simple_strtoul((*p) + 1, p, 16);

	omap_vram_def_sdram_size = memparse(p, &p);

	if (*p == ',')

		omap_vram_def_sdram_start = simple_strtoul(p + 1, &p, 16);

	return 0;

}

__early_param("vram=", omap_vram_early_vram);

early_param("vram", omap_vram_early_vram);



/*

 * Called from map_io. We need to call to this early enough so that we