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

Commit 70b6eaee authored by Florian Tobias Schandinat's avatar Florian Tobias Schandinat
Browse files

Merge tag 'omapdss-for-3.5-rc2' of git://gitorious.org/linux-omap-dss2/linux into fbdev-for-linus 

Small fixes for omapdss driver. Most importantly, fixes a build problem when
debugfs or omapdss debug support is turned off, and fixes a suspend related
crash.
parents c895305e c3a21fc7

arch/arm/mach-omap2/display.c

+2 −2
Original line number Diff line number Diff line
@@ -271,9 +271,9 @@ static struct platform_device *create_simple_dss_pdev(const char *pdev_name, 
		goto err;

	}



	r = omap_device_register(pdev);

	r = platform_device_add(pdev);

	if (r) {

		pr_err("Could not register omap_device for %s\n", pdev_name);

		pr_err("Could not register platform_device for %s\n", pdev_name);

		goto err;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ static ssize_t taal_num_errors_show(struct device *dev, 
{

	struct omap_dss_device *dssdev = to_dss_device(dev);

	struct taal_data *td = dev_get_drvdata(&dssdev->dev);

	u8 errors;

	u8 errors = 0;

	int r;



	mutex_lock(&td->lock);

drivers/video/omap2/dss/core.c

+1 −2
Original line number Diff line number Diff line
@@ -194,8 +194,7 @@ static inline int dss_initialize_debugfs(void) 
static inline void dss_uninitialize_debugfs(void)

{

}

static inline int dss_debugfs_create_file(const char *name,

		void (*write)(struct seq_file *))

int dss_debugfs_create_file(const char *name, void (*write)(struct seq_file *))

{

	return 0;

}

drivers/video/omap2/dss/dsi.c

+1 −1
Original line number Diff line number Diff line
@@ -3724,7 +3724,7 @@ static int dsi_compute_interleave_lp(int blank, int enter_hs, int exit_hs, 
	/* CLKIN4DDR = 16 * TXBYTECLKHS */

	tlp_avail = thsbyte_clk * (blank - trans_lp);



	ttxclkesc = tdsi_fclk / lp_clk_div;

	ttxclkesc = tdsi_fclk * lp_clk_div;



	lp_inter = ((tlp_avail - 8 * thsbyte_clk - 5 * tdsi_fclk) / ttxclkesc -

			26) / 16;

drivers/video/omap2/dss/dss.c

+1 −1
Original line number Diff line number Diff line
@@ -731,7 +731,7 @@ static void dss_runtime_put(void) 
	DSSDBG("dss_runtime_put\n");



	r = pm_runtime_put_sync(&dss.pdev->dev);

	WARN_ON(r < 0);

	WARN_ON(r < 0 && r != -EBUSY);

}



/* DEBUGFS */