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

Commit da9d2f47 authored by Bryan Wu's avatar Bryan Wu Committed by Tomi Valkeinen
Browse files

OMAP: DSS2: remove generic DPI panel driver duplicated panel drivers 



Still keep sharp_ls_panel driver, because it contains blacklight control driver.

Signed-off-by: default avatarBryan Wu <bryan.wu@canonical.com>
Acked-by: default avatarArchit Taneja <archit@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@nokia.com>
parent 89747c91

drivers/video/omap2/displays/Kconfig

+0 −18
Original line number Original line Diff line number Diff line
@@ -9,12 +9,6 @@ config PANEL_GENERIC_DPI 
	  Supports LCD Panel used in TI SDP3430 and EVM boards,

	  Supports LCD Panel used in TI SDP3430 and EVM boards,

	  OMAP3517 EVM boards and CM-T35.

	  OMAP3517 EVM boards and CM-T35.





config PANEL_GENERIC

        tristate "Generic Panel"

        help

	  Generic panel driver.

	  Used for DVI output for Beagle and OMAP3 SDP.



config PANEL_SHARP_LS037V7DW01

config PANEL_SHARP_LS037V7DW01

        tristate "Sharp LS037V7DW01 LCD Panel"

        tristate "Sharp LS037V7DW01 LCD Panel"

        depends on OMAP2_DSS

        depends on OMAP2_DSS
@@ -22,12 +16,6 @@ config PANEL_SHARP_LS037V7DW01 
        help

        help

          LCD Panel used in TI's SDP3430 and EVM boards

          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_NEC_NL8048HL11_01B

config PANEL_NEC_NL8048HL11_01B

	tristate "NEC NL8048HL11-01B Panel"

	tristate "NEC NL8048HL11-01B Panel"

	depends on OMAP2_DSS

	depends on OMAP2_DSS
@@ -41,12 +29,6 @@ config PANEL_TAAL 
        help

        help

          Taal DSI command mode panel from TPO.

          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

config PANEL_TPO_TD043MTEA1

        tristate "TPO TD043MTEA1 LCD Panel"

        tristate "TPO TD043MTEA1 LCD Panel"

        depends on OMAP2_DSS && SPI

        depends on OMAP2_DSS && SPI

drivers/video/omap2/displays/Makefile

+0 −3
Original line number Original line Diff line number Diff line 
obj-$(CONFIG_PANEL_GENERIC_DPI) += panel-generic-dpi.o

obj-$(CONFIG_PANEL_GENERIC_DPI) += panel-generic-dpi.o

obj-$(CONFIG_PANEL_GENERIC) += panel-generic.o

obj-$(CONFIG_PANEL_SHARP_LS037V7DW01) += panel-sharp-ls037v7dw01.o

obj-$(CONFIG_PANEL_SHARP_LS037V7DW01) += panel-sharp-ls037v7dw01.o

obj-$(CONFIG_PANEL_SHARP_LQ043T1DG01) += panel-sharp-lq043t1dg01.o

obj-$(CONFIG_PANEL_NEC_NL8048HL11_01B) += panel-nec-nl8048hl11-01b.o

obj-$(CONFIG_PANEL_NEC_NL8048HL11_01B) += panel-nec-nl8048hl11-01b.o





obj-$(CONFIG_PANEL_TAAL) += panel-taal.o

obj-$(CONFIG_PANEL_TAAL) += panel-taal.o

obj-$(CONFIG_PANEL_TOPPOLY_TDO35S) += panel-toppoly-tdo35s.o

obj-$(CONFIG_PANEL_TPO_TD043MTEA1) += panel-tpo-td043mtea1.o

obj-$(CONFIG_PANEL_TPO_TD043MTEA1) += panel-tpo-td043mtea1.o

obj-$(CONFIG_PANEL_ACX565AKM) += panel-acx565akm.o
 
obj-$(CONFIG_PANEL_ACX565AKM) += panel-acx565akm.o

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

deleted100644 → 0
+0 −174
Original line number Original line Diff line number Diff line 
/*

 * Generic panel support

 *

 * Copyright (C) 2008 Nokia Corporation

 * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License version 2 as published by

 * the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#include <linux/module.h>

#include <linux/delay.h>



#include <plat/display.h>



static struct omap_video_timings generic_panel_timings = {

	/* 640 x 480 @ 60 Hz  Reduced blanking VESA CVT 0.31M3-R */

	.x_res		= 640,

	.y_res		= 480,

	.pixel_clock	= 23500,

	.hfp		= 48,

	.hsw		= 32,

	.hbp		= 80,

	.vfp		= 3,

	.vsw		= 4,

	.vbp		= 7,

};



static int generic_panel_power_on(struct omap_dss_device *dssdev)

{

	int r;



	if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)

		return 0;



	r = omapdss_dpi_display_enable(dssdev);

	if (r)

		goto err0;



	if (dssdev->platform_enable) {

		r = dssdev->platform_enable(dssdev);

		if (r)

			goto err1;

	}



	return 0;

err1:

	omapdss_dpi_display_disable(dssdev);

err0:

	return r;

}



static void generic_panel_power_off(struct omap_dss_device *dssdev)

{

	if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)

		return;



	if (dssdev->platform_disable)

		dssdev->platform_disable(dssdev);



	omapdss_dpi_display_disable(dssdev);

}



static int generic_panel_probe(struct omap_dss_device *dssdev)

{

	dssdev->panel.config = OMAP_DSS_LCD_TFT;

	dssdev->panel.timings = generic_panel_timings;



	return 0;

}



static void generic_panel_remove(struct omap_dss_device *dssdev)

{

}



static int generic_panel_enable(struct omap_dss_device *dssdev)

{

	int r = 0;



	r = generic_panel_power_on(dssdev);

	if (r)

		return r;



	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;



	return 0;

}



static void generic_panel_disable(struct omap_dss_device *dssdev)

{

	generic_panel_power_off(dssdev);



	dssdev->state = OMAP_DSS_DISPLAY_DISABLED;

}



static int generic_panel_suspend(struct omap_dss_device *dssdev)

{

	generic_panel_power_off(dssdev);

	dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;

	return 0;

}



static int generic_panel_resume(struct omap_dss_device *dssdev)

{

	int r = 0;



	r = generic_panel_power_on(dssdev);

	if (r)

		return r;



	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;



	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,



	.enable		= generic_panel_enable,

	.disable	= generic_panel_disable,

	.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,

	},

};



static int __init generic_panel_drv_init(void)

{

	return omap_dss_register_driver(&generic_driver);

}



static void __exit generic_panel_drv_exit(void)

{

	omap_dss_unregister_driver(&generic_driver);

}



module_init(generic_panel_drv_init);

module_exit(generic_panel_drv_exit);

MODULE_LICENSE("GPL");

drivers/video/omap2/displays/panel-sharp-lq043t1dg01.c

deleted100644 → 0
+0 −165
Original line number Original line Diff line number Diff line 
/*

 * LCD panel driver for Sharp LQ043T1DG01

 *

 * Copyright (C) 2009 Texas Instruments Inc

 * Author: Vaibhav Hiremath <hvaibhav@ti.com>

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License version 2 as published by

 * the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#include <linux/module.h>

#include <linux/delay.h>

#include <linux/device.h>

#include <linux/err.h>



#include <plat/display.h>



static struct omap_video_timings sharp_lq_timings = {

	.x_res = 480,

	.y_res = 272,



	.pixel_clock	= 9000,



	.hsw		= 42,

	.hfp		= 3,

	.hbp		= 2,



	.vsw		= 11,

	.vfp		= 3,

	.vbp		= 2,

};



static int sharp_lq_panel_power_on(struct omap_dss_device *dssdev)

{

	int r;



	if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)

		return 0;



	r = omapdss_dpi_display_enable(dssdev);

	if (r)

		goto err0;



	/* wait couple of vsyncs until enabling the LCD */

	msleep(50);



	if (dssdev->platform_enable) {

		r = dssdev->platform_enable(dssdev);

		if (r)

			goto err1;

	}



	return 0;

err1:

	omapdss_dpi_display_disable(dssdev);

err0:

	return r;

}



static void sharp_lq_panel_power_off(struct omap_dss_device *dssdev)

{

	if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)

		return;



	if (dssdev->platform_disable)

		dssdev->platform_disable(dssdev);



	/* wait at least 5 vsyncs after disabling the LCD */

	msleep(100);



	omapdss_dpi_display_disable(dssdev);

}



static int sharp_lq_panel_probe(struct omap_dss_device *dssdev)

{



	dssdev->panel.config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |

		OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IEO;

	dssdev->panel.acb = 0x0;

	dssdev->panel.timings = sharp_lq_timings;



	return 0;

}



static void sharp_lq_panel_remove(struct omap_dss_device *dssdev)

{

}



static int sharp_lq_panel_enable(struct omap_dss_device *dssdev)

{

	int r = 0;



	r = sharp_lq_panel_power_on(dssdev);

	if (r)

		return r;



	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;



	return 0;

}



static void sharp_lq_panel_disable(struct omap_dss_device *dssdev)

{

	sharp_lq_panel_power_off(dssdev);



	dssdev->state = OMAP_DSS_DISPLAY_DISABLED;

}



static int sharp_lq_panel_suspend(struct omap_dss_device *dssdev)

{

	sharp_lq_panel_power_off(dssdev);

	dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;

	return 0;

}



static int sharp_lq_panel_resume(struct omap_dss_device *dssdev)

{

	int r = 0;



	r = sharp_lq_panel_power_on(dssdev);

	if (r)

		return r;



	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;



	return 0;

}



static struct omap_dss_driver sharp_lq_driver = {

	.probe		= sharp_lq_panel_probe,

	.remove		= sharp_lq_panel_remove,



	.enable		= sharp_lq_panel_enable,

	.disable	= sharp_lq_panel_disable,

	.suspend	= sharp_lq_panel_suspend,

	.resume		= sharp_lq_panel_resume,



	.driver         = {

		.name   = "sharp_lq_panel",

		.owner  = THIS_MODULE,

	},

};



static int __init sharp_lq_panel_drv_init(void)

{

	return omap_dss_register_driver(&sharp_lq_driver);

}



static void __exit sharp_lq_panel_drv_exit(void)

{

	omap_dss_unregister_driver(&sharp_lq_driver);

}



module_init(sharp_lq_panel_drv_init);

module_exit(sharp_lq_panel_drv_exit);

MODULE_LICENSE("GPL");

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

deleted100644 → 0
+0 −164
Original line number Original line Diff line number Diff line 
/*

 * LCD panel driver for Toppoly TDO35S

 *

 * Copyright (C) 2009 CompuLab, Ltd.

 * Author: Mike Rapoport <mike@compulab.co.il>

 *

 * Based on generic panel support

 * Copyright (C) 2008 Nokia Corporation

 * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License version 2 as published by

 * the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#include <linux/module.h>

#include <linux/delay.h>



#include <plat/display.h>



static struct omap_video_timings toppoly_tdo_panel_timings = {

	/* 640 x 480 @ 60 Hz  Reduced blanking VESA CVT 0.31M3-R */

	.x_res		= 480,

	.y_res		= 640,



	.pixel_clock	= 26000,



	.hfp		= 104,

	.hsw		= 8,

	.hbp		= 8,



	.vfp		= 4,

	.vsw		= 2,

	.vbp		= 2,

};



static int toppoly_tdo_panel_power_on(struct omap_dss_device *dssdev)

{

	int r;



	if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)

		return 0;



	r = omapdss_dpi_display_enable(dssdev);

	if (r)

		goto err0;



	if (dssdev->platform_enable) {

		r = dssdev->platform_enable(dssdev);

		if (r)

			goto err1;

	}



	return 0;

err1:

	omapdss_dpi_display_disable(dssdev);

err0:

	return r;

}



static void toppoly_tdo_panel_power_off(struct omap_dss_device *dssdev)

{

	if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)

		return;



	if (dssdev->platform_disable)

		dssdev->platform_disable(dssdev);



	omapdss_dpi_display_disable(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 |

			       OMAP_DSS_LCD_IPC |

			       OMAP_DSS_LCD_ONOFF;



	dssdev->panel.timings = toppoly_tdo_panel_timings;



	return 0;

}



static void toppoly_tdo_panel_remove(struct omap_dss_device *dssdev)

{

}



static int toppoly_tdo_panel_enable(struct omap_dss_device *dssdev)

{

	int r = 0;



	r = toppoly_tdo_panel_power_on(dssdev);

	if (r)

		return r;



	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;



	return 0;

}



static void toppoly_tdo_panel_disable(struct omap_dss_device *dssdev)

{

	toppoly_tdo_panel_power_off(dssdev);



	dssdev->state = OMAP_DSS_DISPLAY_DISABLED;

}



static int toppoly_tdo_panel_suspend(struct omap_dss_device *dssdev)

{

	toppoly_tdo_panel_power_off(dssdev);

	dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;

	return 0;

}



static int toppoly_tdo_panel_resume(struct omap_dss_device *dssdev)

{

	int r = 0;



	r = toppoly_tdo_panel_power_on(dssdev);

	if (r)

		return r;



	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;



	return 0;

}



static struct omap_dss_driver generic_driver = {

	.probe		= toppoly_tdo_panel_probe,

	.remove		= toppoly_tdo_panel_remove,



	.enable		= toppoly_tdo_panel_enable,

	.disable	= toppoly_tdo_panel_disable,

	.suspend	= toppoly_tdo_panel_suspend,

	.resume		= toppoly_tdo_panel_resume,



	.driver         = {

		.name   = "toppoly_tdo35s_panel",

		.owner  = THIS_MODULE,

	},

};



static int __init toppoly_tdo_panel_drv_init(void)

{

	return omap_dss_register_driver(&generic_driver);

}



static void __exit toppoly_tdo_panel_drv_exit(void)

{

	omap_dss_unregister_driver(&generic_driver);

}



module_init(toppoly_tdo_panel_drv_init);

module_exit(toppoly_tdo_panel_drv_exit);

MODULE_LICENSE("GPL");