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

Commit 9296dbd7 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

Merge branch '3.8/misc-2' 

Merge omapdss miscellaneous patches.
parents f8fb7d7b ffc81fc5

arch/arm/mach-omap2/display.c

+10 −5
Original line number Original line Diff line number Diff line
@@ -100,17 +100,20 @@ static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initconst = { 
	{ "dss_hdmi", "omapdss_hdmi", -1 },

	{ "dss_hdmi", "omapdss_hdmi", -1 },

};

};





static void __init omap4_hdmi_mux_pads(enum omap_hdmi_flags flags)

static void __init omap4_tpd12s015_mux_pads(void)

{

{

	u32 reg;

	u16 control_i2c_1;



	omap_mux_init_signal("hdmi_cec",

	omap_mux_init_signal("hdmi_cec",

			OMAP_PIN_INPUT_PULLUP);

			OMAP_PIN_INPUT_PULLUP);

	omap_mux_init_signal("hdmi_ddc_scl",

	omap_mux_init_signal("hdmi_ddc_scl",

			OMAP_PIN_INPUT_PULLUP);

			OMAP_PIN_INPUT_PULLUP);

	omap_mux_init_signal("hdmi_ddc_sda",

	omap_mux_init_signal("hdmi_ddc_sda",

			OMAP_PIN_INPUT_PULLUP);

			OMAP_PIN_INPUT_PULLUP);

}



static void __init omap4_hdmi_mux_pads(enum omap_hdmi_flags flags)

{

	u32 reg;

	u16 control_i2c_1;





	/*

	/*

	 * CONTROL_I2C_1: HDMI_DDC_SDA_PULLUPRESX (bit 28) and

	 * CONTROL_I2C_1: HDMI_DDC_SDA_PULLUPRESX (bit 28) and
@@ -161,8 +164,10 @@ static int omap4_dsi_mux_pads(int dsi_id, unsigned lanes) 




int __init omap_hdmi_init(enum omap_hdmi_flags flags)

int __init omap_hdmi_init(enum omap_hdmi_flags flags)

{

{

	if (cpu_is_omap44xx())

	if (cpu_is_omap44xx()) {

		omap4_hdmi_mux_pads(flags);

		omap4_hdmi_mux_pads(flags);

		omap4_tpd12s015_mux_pads();

	}





	return 0;

	return 0;

}

}

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

+0 −23
Original line number Original line Diff line number Diff line
@@ -710,27 +710,6 @@ static void acx_panel_disable(struct omap_dss_device *dssdev) 
	dssdev->state = OMAP_DSS_DISPLAY_DISABLED;

	dssdev->state = OMAP_DSS_DISPLAY_DISABLED;

}

}





static int acx_panel_suspend(struct omap_dss_device *dssdev)

{

	dev_dbg(&dssdev->dev, "%s\n", __func__);

	acx_panel_power_off(dssdev);

	dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;

	return 0;

}



static int acx_panel_resume(struct omap_dss_device *dssdev)

{

	int r;



	dev_dbg(&dssdev->dev, "%s\n", __func__);

	r = acx_panel_power_on(dssdev);

	if (r)

		return r;



	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;

	return 0;

}



static void acx_panel_set_timings(struct omap_dss_device *dssdev,

static void acx_panel_set_timings(struct omap_dss_device *dssdev,

		struct omap_video_timings *timings)

		struct omap_video_timings *timings)

{

{
@@ -752,8 +731,6 @@ static struct omap_dss_driver acx_panel_driver = { 




	.enable		= acx_panel_enable,

	.enable		= acx_panel_enable,

	.disable	= acx_panel_disable,

	.disable	= acx_panel_disable,

	.suspend	= acx_panel_suspend,

	.resume		= acx_panel_resume,





	.set_timings	= acx_panel_set_timings,

	.set_timings	= acx_panel_set_timings,

	.check_timings	= acx_panel_check_timings,

	.check_timings	= acx_panel_check_timings,

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

+0 −36
Original line number Original line Diff line number Diff line
@@ -688,40 +688,6 @@ static void generic_dpi_panel_disable(struct omap_dss_device *dssdev) 
	mutex_unlock(&drv_data->lock);

	mutex_unlock(&drv_data->lock);

}

}





static int generic_dpi_panel_suspend(struct omap_dss_device *dssdev)

{

	struct panel_drv_data *drv_data = dev_get_drvdata(&dssdev->dev);



	mutex_lock(&drv_data->lock);



	generic_dpi_panel_power_off(dssdev);



	dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;



	mutex_unlock(&drv_data->lock);



	return 0;

}



static int generic_dpi_panel_resume(struct omap_dss_device *dssdev)

{

	struct panel_drv_data *drv_data = dev_get_drvdata(&dssdev->dev);

	int r;



	mutex_lock(&drv_data->lock);



	r = generic_dpi_panel_power_on(dssdev);

	if (r)

		goto err;



	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;



err:

	mutex_unlock(&drv_data->lock);



	return r;

}



static void generic_dpi_panel_set_timings(struct omap_dss_device *dssdev,

static void generic_dpi_panel_set_timings(struct omap_dss_device *dssdev,

		struct omap_video_timings *timings)

		struct omap_video_timings *timings)

{

{
@@ -769,8 +735,6 @@ static struct omap_dss_driver dpi_driver = { 




	.enable		= generic_dpi_panel_enable,

	.enable		= generic_dpi_panel_enable,

	.disable	= generic_dpi_panel_disable,

	.disable	= generic_dpi_panel_disable,

	.suspend	= generic_dpi_panel_suspend,

	.resume		= generic_dpi_panel_resume,





	.set_timings	= generic_dpi_panel_set_timings,

	.set_timings	= generic_dpi_panel_set_timings,

	.get_timings	= generic_dpi_panel_get_timings,

	.get_timings	= generic_dpi_panel_get_timings,

drivers/video/omap2/displays/panel-lgphilips-lb035q02.c

+0 −34
Original line number Original line Diff line number Diff line
@@ -143,46 +143,12 @@ static void lb035q02_panel_disable(struct omap_dss_device *dssdev) 
	mutex_unlock(&ld->lock);

	mutex_unlock(&ld->lock);

}

}





static int lb035q02_panel_suspend(struct omap_dss_device *dssdev)

{

	struct lb035q02_data *ld = dev_get_drvdata(&dssdev->dev);



	mutex_lock(&ld->lock);



	lb035q02_panel_power_off(dssdev);

	dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;



	mutex_unlock(&ld->lock);

	return 0;

}



static int lb035q02_panel_resume(struct omap_dss_device *dssdev)

{

	struct lb035q02_data *ld = dev_get_drvdata(&dssdev->dev);

	int r;



	mutex_lock(&ld->lock);



	r = lb035q02_panel_power_on(dssdev);

	if (r)

		goto err;

	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;



	mutex_unlock(&ld->lock);

	return 0;

err:

	mutex_unlock(&ld->lock);

	return r;

}



static struct omap_dss_driver lb035q02_driver = {

static struct omap_dss_driver lb035q02_driver = {

	.probe		= lb035q02_panel_probe,

	.probe		= lb035q02_panel_probe,

	.remove		= lb035q02_panel_remove,

	.remove		= lb035q02_panel_remove,





	.enable		= lb035q02_panel_enable,

	.enable		= lb035q02_panel_enable,

	.disable	= lb035q02_panel_disable,

	.disable	= lb035q02_panel_disable,

	.suspend	= lb035q02_panel_suspend,

	.resume		= lb035q02_panel_resume,





	.driver         = {

	.driver         = {

		.name   = "lgphilips_lb035q02_panel",

		.name   = "lgphilips_lb035q02_panel",

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

+0 −50
Original line number Original line Diff line number Diff line
@@ -574,54 +574,6 @@ static void n8x0_panel_disable(struct omap_dss_device *dssdev) 
	mutex_unlock(&ddata->lock);

	mutex_unlock(&ddata->lock);

}

}





static int n8x0_panel_suspend(struct omap_dss_device *dssdev)

{

	struct panel_drv_data *ddata = get_drv_data(dssdev);



	dev_dbg(&dssdev->dev, "suspend\n");



	mutex_lock(&ddata->lock);



	rfbi_bus_lock();



	n8x0_panel_power_off(dssdev);



	rfbi_bus_unlock();



	dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;



	mutex_unlock(&ddata->lock);



	return 0;

}



static int n8x0_panel_resume(struct omap_dss_device *dssdev)

{

	struct panel_drv_data *ddata = get_drv_data(dssdev);

	int r;



	dev_dbg(&dssdev->dev, "resume\n");



	mutex_lock(&ddata->lock);



	rfbi_bus_lock();



	r = n8x0_panel_power_on(dssdev);



	rfbi_bus_unlock();



	if (r) {

		mutex_unlock(&ddata->lock);

		return r;

	}



	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;



	mutex_unlock(&ddata->lock);



	return 0;

}



static void n8x0_panel_get_resolution(struct omap_dss_device *dssdev,

static void n8x0_panel_get_resolution(struct omap_dss_device *dssdev,

		u16 *xres, u16 *yres)

		u16 *xres, u16 *yres)

{

{
@@ -683,8 +635,6 @@ static struct omap_dss_driver n8x0_panel_driver = { 




	.enable		= n8x0_panel_enable,

	.enable		= n8x0_panel_enable,

	.disable	= n8x0_panel_disable,

	.disable	= n8x0_panel_disable,

	.suspend	= n8x0_panel_suspend,

	.resume		= n8x0_panel_resume,





	.update		= n8x0_panel_update,

	.update		= n8x0_panel_update,

	.sync		= n8x0_panel_sync,

	.sync		= n8x0_panel_sync,