* [PATCH 1/3] OMAP: DSS2: Add generic DPI panel display driver
2010-11-09 17:12 [PATCH 0/3] OMAP: DSS2: introduce generic panel display driver (try #5) Bryan Wu
@ 2010-11-09 17:12 ` Bryan Wu
2010-11-10 14:35 ` Tomi Valkeinen
2010-11-09 17:12 ` [PATCH 2/3] OMAP: use generic DPI panel driver in board files Bryan Wu
2010-11-09 17:12 ` [PATCH 3/3] OMAP: DSS2: remove generic DPI panel driver duplicated panel drivers Bryan Wu
2 siblings, 1 reply; 21+ messages in thread
From: Bryan Wu @ 2010-11-09 17:12 UTC (permalink / raw)
To: linux-arm-kernel
Generic DPI panel driver includes the driver and 4 similar panel configurations. It
will match the panel name which is passed from platform data and setup the
right configurations.
With generic DPI panel driver, we can remove those 4 duplicated panel display
drivers. In the future, it is simple for us just add new panel configuration
date in panel-generic-dpi.c to support new display panel.
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
---
.../arm/plat-omap/include/plat/panel-generic-dpi.h | 37 +++
drivers/video/omap2/displays/Kconfig | 8 +
drivers/video/omap2/displays/Makefile | 1 +
drivers/video/omap2/displays/panel-generic-dpi.c | 309 ++++++++++++++++++++
4 files changed, 355 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/plat-omap/include/plat/panel-generic-dpi.h
create mode 100644 drivers/video/omap2/displays/panel-generic-dpi.c
diff --git a/arch/arm/plat-omap/include/plat/panel-generic-dpi.h b/arch/arm/plat-omap/include/plat/panel-generic-dpi.h
new file mode 100644
index 0000000..7906197
--- /dev/null
+++ b/arch/arm/plat-omap/include/plat/panel-generic-dpi.h
@@ -0,0 +1,37 @@
+/*
+ * Header for generic DPI panel driver
+ *
+ * Copyright (C) 2010 Canonical Ltd.
+ * Author: Bryan Wu <bryan.wu@canonical.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/>.
+ */
+
+#ifndef __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H
+#define __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H
+
+#include "display.h"
+
+/**
+ * struct panel_generic_dpi_data - panel driver configuration data
+ * @name: panel name
+ * @platform_enable: platform specific panel enable function
+ * @platform_disable: platform specific panel disable function
+ */
+struct panel_generic_dpi_data {
+ const char *name;
+ int (*platform_enable)(struct omap_dss_device *dssdev);
+ void (*platform_disable)(struct omap_dss_device *dssdev);
+};
+
+#endif /* __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H */
diff --git a/drivers/video/omap2/displays/Kconfig b/drivers/video/omap2/displays/Kconfig
index 12327bb..cb3e339 100644
--- a/drivers/video/omap2/displays/Kconfig
+++ b/drivers/video/omap2/displays/Kconfig
@@ -1,6 +1,14 @@
menu "OMAP2/3 Display Device Drivers"
depends on OMAP2_DSS
+config PANEL_GENERIC_DPI
+ tristate "Generic DPI Panel"
+ help
+ Generic DPI panel driver.
+ Supports DVI output for Beagle and OMAP3 SDP.
+ Supports LCD Panel used in TI SDP3430 and EVM boards,
+ OMAP3517 EVM boards and CM-T35.
+
config PANEL_GENERIC
tristate "Generic Panel"
help
diff --git a/drivers/video/omap2/displays/Makefile b/drivers/video/omap2/displays/Makefile
index aa38609..022058c 100644
--- a/drivers/video/omap2/displays/Makefile
+++ b/drivers/video/omap2/displays/Makefile
@@ -1,3 +1,4 @@
+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_LQ043T1DG01) += panel-sharp-lq043t1dg01.o
diff --git a/drivers/video/omap2/displays/panel-generic-dpi.c b/drivers/video/omap2/displays/panel-generic-dpi.c
new file mode 100644
index 0000000..7ddd631
--- /dev/null
+++ b/drivers/video/omap2/displays/panel-generic-dpi.c
@@ -0,0 +1,309 @@
+/*
+ * Generic DPI Panels support
+ *
+ * Copyright (C) 2010 Canonical Ltd.
+ * Author: Bryan Wu <bryan.wu@canonical.com>
+ *
+ * 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/panel-generic-dpi.h>
+
+struct panel_config {
+ struct omap_video_timings timings;
+
+ int acbi; /* ac-bias pin transitions per interrupt */
+ /* Unit: line clocks */
+ int acb; /* ac-bias pin frequency */
+
+ enum omap_panel_config config;
+
+ /*
+ * Used to match device to panel configuration
+ * when use generic panel driver
+ */
+ const char *name;
+};
+
+/* Panel configurations */
+static struct panel_config generic_dpi_panels[] = {
+ /* Generic Panel */
+ {
+ {
+ .x_res = 640,
+ .y_res = 480,
+
+ .pixel_clock = 23500,
+
+ .hfp = 48,
+ .hsw = 32,
+ .hbp = 80,
+
+ .vfp = 3,
+ .vsw = 4,
+ .vbp = 7,
+ },
+ .acbi = 0x0,
+ .acb = 0x0,
+ .config = OMAP_DSS_LCD_TFT,
+ .name = "generic",
+ },
+
+ /* Sharp LQ043T1DG01 */
+ {
+ {
+ .x_res = 480,
+ .y_res = 272,
+
+ .pixel_clock = 9000,
+
+ .hsw = 42,
+ .hfp = 3,
+ .hbp = 2,
+
+ .vsw = 11,
+ .vfp = 3,
+ .vbp = 2,
+ },
+ .acbi = 0x0,
+ .acb = 0x0,
+ .config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+ OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IEO,
+ .name = "sharp_lq",
+ },
+
+ /* Sharp LS037V7DW01 */
+ {
+ {
+ .x_res = 480,
+ .y_res = 640,
+
+ .pixel_clock = 19200,
+
+ .hsw = 2,
+ .hfp = 1,
+ .hbp = 28,
+
+ .vsw = 1,
+ .vfp = 1,
+ .vbp = 1,
+ },
+ .acbi = 0x0,
+ .acb = 0x28,
+ .config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+ OMAP_DSS_LCD_IHS,
+ .name = "sharp_ls",
+ },
+
+ /* Toppoly TDO35S */
+ {
+ {
+ .x_res = 480,
+ .y_res = 640,
+
+ .pixel_clock = 26000,
+
+ .hfp = 104,
+ .hsw = 8,
+ .hbp = 8,
+
+ .vfp = 4,
+ .vsw = 2,
+ .vbp = 2,
+ },
+ .acbi = 0x0,
+ .acb = 0x0,
+ .config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+ OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IPC |
+ OMAP_DSS_LCD_ONOFF,
+ .name = "toppoly_tdo35s",
+ },
+};
+
+static inline struct panel_generic_dpi_data
+*get_panel_data(const struct omap_dss_device *dssdev)
+{
+ return (struct panel_generic_dpi_data *) dssdev->data;
+}
+
+
+static int generic_dpi_panel_power_on(struct omap_dss_device *dssdev)
+{
+ int r;
+ struct panel_generic_dpi_data *panel_data = get_panel_data(dssdev);
+
+ if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
+ return 0;
+
+ r = omapdss_dpi_display_enable(dssdev);
+ if (r)
+ goto err0;
+
+ if (panel_data->platform_enable) {
+ r = panel_data->platform_enable(dssdev);
+ if (r)
+ goto err1;
+ }
+
+ return 0;
+err1:
+ omapdss_dpi_display_disable(dssdev);
+err0:
+ return r;
+}
+
+static void generic_dpi_panel_power_off(struct omap_dss_device *dssdev)
+{
+ struct panel_generic_dpi_data *panel_data = get_panel_data(dssdev);
+
+ if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
+ return;
+
+ if (panel_data->platform_disable)
+ panel_data->platform_disable(dssdev);
+
+ omapdss_dpi_display_disable(dssdev);
+}
+
+static int generic_dpi_panel_probe(struct omap_dss_device *dssdev)
+{
+ struct panel_generic_dpi_data *panel_data = get_panel_data(dssdev);
+ struct panel_config *panel_config = NULL;
+ int i;
+
+ dev_dbg(&dssdev->dev, "probe\n");
+
+ if (!panel_data || !panel_data->name)
+ return -EINVAL;
+
+ for (i = 0; i < ARRAY_SIZE(generic_dpi_panels); i++) {
+ if (strcmp(panel_data->name, generic_dpi_panels[i].name) == 0) {
+ panel_config = &generic_dpi_panels[i];
+ break;
+ }
+ }
+
+ if (!panel_config)
+ return -EINVAL;
+
+ dssdev->type = OMAP_DISPLAY_TYPE_DPI;
+ dssdev->panel.config = panel_config->config;
+ dssdev->panel.timings = panel_config->timings;
+ dssdev->panel.acb = panel_config->acb;
+ dssdev->panel.acbi = panel_config->acbi;
+
+ return 0;
+}
+
+static void generic_dpi_panel_remove(struct omap_dss_device *dssdev)
+{
+}
+
+static int generic_dpi_panel_enable(struct omap_dss_device *dssdev)
+{
+ int r = 0;
+
+ r = generic_dpi_panel_power_on(dssdev);
+ if (r)
+ return r;
+
+ dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+ return 0;
+}
+
+static void generic_dpi_panel_disable(struct omap_dss_device *dssdev)
+{
+ generic_dpi_panel_power_off(dssdev);
+
+ dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
+}
+
+static int generic_dpi_panel_suspend(struct omap_dss_device *dssdev)
+{
+ generic_dpi_panel_power_off(dssdev);
+
+ dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
+
+ return 0;
+}
+
+static int generic_dpi_panel_resume(struct omap_dss_device *dssdev)
+{
+ int r = 0;
+
+ r = generic_dpi_panel_power_on(dssdev);
+ if (r)
+ return r;
+
+ dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+ return 0;
+}
+
+static void generic_dpi_panel_set_timings(struct omap_dss_device *dssdev,
+ struct omap_video_timings *timings)
+{
+ dpi_set_timings(dssdev, timings);
+}
+
+static void generic_dpi_panel_get_timings(struct omap_dss_device *dssdev,
+ struct omap_video_timings *timings)
+{
+ *timings = dssdev->panel.timings;
+}
+
+static int generic_dpi_panel_check_timings(struct omap_dss_device *dssdev,
+ struct omap_video_timings *timings)
+{
+ return dpi_check_timings(dssdev, timings);
+}
+
+static struct omap_dss_driver dpi_driver = {
+ .probe = generic_dpi_panel_probe,
+ .remove = generic_dpi_panel_remove,
+
+ .enable = generic_dpi_panel_enable,
+ .disable = generic_dpi_panel_disable,
+ .suspend = generic_dpi_panel_suspend,
+ .resume = generic_dpi_panel_resume,
+
+ .set_timings = generic_dpi_panel_set_timings,
+ .get_timings = generic_dpi_panel_get_timings,
+ .check_timings = generic_dpi_panel_check_timings,
+
+ .driver = {
+ .name = "generic_dpi_panel",
+ .owner = THIS_MODULE,
+ },
+};
+
+static int __init generic_dpi_panel_drv_init(void)
+{
+ return omap_dss_register_driver(&dpi_driver);
+}
+
+static void __exit generic_dpi_panel_drv_exit(void)
+{
+ omap_dss_unregister_driver(&dpi_driver);
+}
+
+module_init(generic_dpi_panel_drv_init);
+module_exit(generic_dpi_panel_drv_exit);
+MODULE_LICENSE("GPL");
--
1.7.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 1/3] OMAP: DSS2: Add generic DPI panel display driver
2010-11-09 17:12 ` [PATCH 1/3] OMAP: DSS2: Add generic DPI panel display driver Bryan Wu
@ 2010-11-10 14:35 ` Tomi Valkeinen
2010-11-14 1:42 ` Bryan Wu
0 siblings, 1 reply; 21+ messages in thread
From: Tomi Valkeinen @ 2010-11-10 14:35 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Tue, 2010-11-09 at 18:12 +0100, ext Bryan Wu wrote:
> Generic DPI panel driver includes the driver and 4 similar panel configurations. It
> will match the panel name which is passed from platform data and setup the
> right configurations.
>
> With generic DPI panel driver, we can remove those 4 duplicated panel display
> drivers. In the future, it is simple for us just add new panel configuration
> date in panel-generic-dpi.c to support new display panel.
This is looking good, but still a couple of comments inline:
> Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
> ---
> .../arm/plat-omap/include/plat/panel-generic-dpi.h | 37 +++
> drivers/video/omap2/displays/Kconfig | 8 +
> drivers/video/omap2/displays/Makefile | 1 +
> drivers/video/omap2/displays/panel-generic-dpi.c | 309 ++++++++++++++++++++
> 4 files changed, 355 insertions(+), 0 deletions(-)
> create mode 100644 arch/arm/plat-omap/include/plat/panel-generic-dpi.h
> create mode 100644 drivers/video/omap2/displays/panel-generic-dpi.c
>
> diff --git a/arch/arm/plat-omap/include/plat/panel-generic-dpi.h b/arch/arm/plat-omap/include/plat/panel-generic-dpi.h
> new file mode 100644
> index 0000000..7906197
> --- /dev/null
> +++ b/arch/arm/plat-omap/include/plat/panel-generic-dpi.h
> @@ -0,0 +1,37 @@
> +/*
> + * Header for generic DPI panel driver
> + *
> + * Copyright (C) 2010 Canonical Ltd.
> + * Author: Bryan Wu <bryan.wu@canonical.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/>.
> + */
> +
> +#ifndef __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H
> +#define __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H
> +
> +#include "display.h"
> +
> +/**
> + * struct panel_generic_dpi_data - panel driver configuration data
> + * @name: panel name
> + * @platform_enable: platform specific panel enable function
> + * @platform_disable: platform specific panel disable function
> + */
> +struct panel_generic_dpi_data {
> + const char *name;
> + int (*platform_enable)(struct omap_dss_device *dssdev);
> + void (*platform_disable)(struct omap_dss_device *dssdev);
> +};
> +
> +#endif /* __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H */
> diff --git a/drivers/video/omap2/displays/Kconfig b/drivers/video/omap2/displays/Kconfig
> index 12327bb..cb3e339 100644
> --- a/drivers/video/omap2/displays/Kconfig
> +++ b/drivers/video/omap2/displays/Kconfig
> @@ -1,6 +1,14 @@
> menu "OMAP2/3 Display Device Drivers"
> depends on OMAP2_DSS
>
> +config PANEL_GENERIC_DPI
> + tristate "Generic DPI Panel"
> + help
> + Generic DPI panel driver.
> + Supports DVI output for Beagle and OMAP3 SDP.
> + Supports LCD Panel used in TI SDP3430 and EVM boards,
> + OMAP3517 EVM boards and CM-T35.
> +
> config PANEL_GENERIC
> tristate "Generic Panel"
> help
> diff --git a/drivers/video/omap2/displays/Makefile b/drivers/video/omap2/displays/Makefile
> index aa38609..022058c 100644
> --- a/drivers/video/omap2/displays/Makefile
> +++ b/drivers/video/omap2/displays/Makefile
> @@ -1,3 +1,4 @@
> +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_LQ043T1DG01) += panel-sharp-lq043t1dg01.o
> diff --git a/drivers/video/omap2/displays/panel-generic-dpi.c b/drivers/video/omap2/displays/panel-generic-dpi.c
> new file mode 100644
> index 0000000..7ddd631
> --- /dev/null
> +++ b/drivers/video/omap2/displays/panel-generic-dpi.c
> @@ -0,0 +1,309 @@
> +/*
> + * Generic DPI Panels support
> + *
> + * Copyright (C) 2010 Canonical Ltd.
> + * Author: Bryan Wu <bryan.wu@canonical.com>
> + *
> + * 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/panel-generic-dpi.h>
> +
> +struct panel_config {
> + struct omap_video_timings timings;
> +
> + int acbi; /* ac-bias pin transitions per interrupt */
> + /* Unit: line clocks */
> + int acb; /* ac-bias pin frequency */
> +
> + enum omap_panel_config config;
> +
> + /*
> + * Used to match device to panel configuration
> + * when use generic panel driver
> + */
> + const char *name;
> +};
> +
> +/* Panel configurations */
> +static struct panel_config generic_dpi_panels[] = {
> + /* Generic Panel */
> + {
> + {
> + .x_res = 640,
> + .y_res = 480,
> +
> + .pixel_clock = 23500,
> +
> + .hfp = 48,
> + .hsw = 32,
> + .hbp = 80,
> +
> + .vfp = 3,
> + .vsw = 4,
> + .vbp = 7,
> + },
> + .acbi = 0x0,
> + .acb = 0x0,
> + .config = OMAP_DSS_LCD_TFT,
> + .name = "generic",
> + },
> +
> + /* Sharp LQ043T1DG01 */
> + {
> + {
> + .x_res = 480,
> + .y_res = 272,
> +
> + .pixel_clock = 9000,
> +
> + .hsw = 42,
> + .hfp = 3,
> + .hbp = 2,
> +
> + .vsw = 11,
> + .vfp = 3,
> + .vbp = 2,
> + },
> + .acbi = 0x0,
> + .acb = 0x0,
> + .config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
> + OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IEO,
> + .name = "sharp_lq",
> + },
> +
> + /* Sharp LS037V7DW01 */
> + {
> + {
> + .x_res = 480,
> + .y_res = 640,
> +
> + .pixel_clock = 19200,
> +
> + .hsw = 2,
> + .hfp = 1,
> + .hbp = 28,
> +
> + .vsw = 1,
> + .vfp = 1,
> + .vbp = 1,
> + },
> + .acbi = 0x0,
> + .acb = 0x28,
> + .config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
> + OMAP_DSS_LCD_IHS,
> + .name = "sharp_ls",
> + },
> +
> + /* Toppoly TDO35S */
> + {
> + {
> + .x_res = 480,
> + .y_res = 640,
> +
> + .pixel_clock = 26000,
> +
> + .hfp = 104,
> + .hsw = 8,
> + .hbp = 8,
> +
> + .vfp = 4,
> + .vsw = 2,
> + .vbp = 2,
> + },
> + .acbi = 0x0,
> + .acb = 0x0,
> + .config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
> + OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IPC |
> + OMAP_DSS_LCD_ONOFF,
> + .name = "toppoly_tdo35s",
> + },
> +};
> +
> +static inline struct panel_generic_dpi_data
> +*get_panel_data(const struct omap_dss_device *dssdev)
> +{
> + return (struct panel_generic_dpi_data *) dssdev->data;
> +}
> +
> +
> +static int generic_dpi_panel_power_on(struct omap_dss_device *dssdev)
> +{
> + int r;
> + struct panel_generic_dpi_data *panel_data = get_panel_data(dssdev);
> +
> + if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
> + return 0;
> +
> + r = omapdss_dpi_display_enable(dssdev);
> + if (r)
> + goto err0;
> +
> + if (panel_data->platform_enable) {
> + r = panel_data->platform_enable(dssdev);
> + if (r)
> + goto err1;
> + }
> +
> + return 0;
> +err1:
> + omapdss_dpi_display_disable(dssdev);
> +err0:
> + return r;
> +}
> +
> +static void generic_dpi_panel_power_off(struct omap_dss_device *dssdev)
> +{
> + struct panel_generic_dpi_data *panel_data = get_panel_data(dssdev);
> +
> + if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
> + return;
> +
> + if (panel_data->platform_disable)
> + panel_data->platform_disable(dssdev);
> +
> + omapdss_dpi_display_disable(dssdev);
> +}
For both panel power on and off some panels require some sleep times:
when powering on, the video interface has to be enabled for some time
before the panel can be enabled, and similarly when powering off the
video interface needs to be on for some time after the panel has been
disabled.
See for example sharp_lq driver's power_on/off.
This should be handled similarly that what we have in panel-taal:
configuration options in the panel_config struct for the sleep times
(and if it's 0, no sleep done).
> +
> +static int generic_dpi_panel_probe(struct omap_dss_device *dssdev)
> +{
> + struct panel_generic_dpi_data *panel_data = get_panel_data(dssdev);
> + struct panel_config *panel_config = NULL;
> + int i;
> +
> + dev_dbg(&dssdev->dev, "probe\n");
> +
> + if (!panel_data || !panel_data->name)
> + return -EINVAL;
> +
> + for (i = 0; i < ARRAY_SIZE(generic_dpi_panels); i++) {
> + if (strcmp(panel_data->name, generic_dpi_panels[i].name) == 0) {
> + panel_config = &generic_dpi_panels[i];
> + break;
> + }
> + }
> +
> + if (!panel_config)
> + return -EINVAL;
> +
> + dssdev->type = OMAP_DISPLAY_TYPE_DPI;
Leave this display type also in to the board file. It defines the
interface (like the data_lines), not the panel.
I think otherwise the patches look good. At some point we should add
backlight support also, so that we can remove a few drivers more (and
get rid of the extra backlight stuff in omap_dss_device struct).
Tomi
^ permalink raw reply [flat|nested] 21+ messages in thread* [PATCH 1/3] OMAP: DSS2: Add generic DPI panel display driver
2010-11-10 14:35 ` Tomi Valkeinen
@ 2010-11-14 1:42 ` Bryan Wu
2010-11-15 4:05 ` Taneja, Archit
2010-11-15 9:16 ` Tomi Valkeinen
0 siblings, 2 replies; 21+ messages in thread
From: Bryan Wu @ 2010-11-14 1:42 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 10, 2010 at 10:35 PM, Tomi Valkeinen
<tomi.valkeinen@nokia.com> wrote:
> Hi,
>
> On Tue, 2010-11-09 at 18:12 +0100, ext Bryan Wu wrote:
>> Generic DPI panel driver includes the driver and 4 similar panel configurations. It
>> will match the panel name which is passed from platform data and setup the
>> right configurations.
>>
>> With generic DPI panel driver, we can remove those 4 duplicated panel display
>> drivers. In the future, it is simple for us just add new panel configuration
>> date in panel-generic-dpi.c to support new display panel.
>
> This is looking good, but still a couple of comments inline:
>
>> Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
>> ---
>> ?.../arm/plat-omap/include/plat/panel-generic-dpi.h | ? 37 +++
>> ?drivers/video/omap2/displays/Kconfig ? ? ? ? ? ? ? | ? ?8 +
>> ?drivers/video/omap2/displays/Makefile ? ? ? ? ? ? ?| ? ?1 +
>> ?drivers/video/omap2/displays/panel-generic-dpi.c ? | ?309 ++++++++++++++++++++
>> ?4 files changed, 355 insertions(+), 0 deletions(-)
>> ?create mode 100644 arch/arm/plat-omap/include/plat/panel-generic-dpi.h
>> ?create mode 100644 drivers/video/omap2/displays/panel-generic-dpi.c
>>
>> diff --git a/arch/arm/plat-omap/include/plat/panel-generic-dpi.h b/arch/arm/plat-omap/include/plat/panel-generic-dpi.h
>> new file mode 100644
>> index 0000000..7906197
>> --- /dev/null
>> +++ b/arch/arm/plat-omap/include/plat/panel-generic-dpi.h
>> @@ -0,0 +1,37 @@
>> +/*
>> + * Header for generic DPI panel driver
>> + *
>> + * Copyright (C) 2010 Canonical Ltd.
>> + * Author: Bryan Wu <bryan.wu@canonical.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/>.
>> + */
>> +
>> +#ifndef __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H
>> +#define __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H
>> +
>> +#include "display.h"
>> +
>> +/**
>> + * struct panel_generic_dpi_data - panel driver configuration data
>> + * @name: panel name
>> + * @platform_enable: platform specific panel enable function
>> + * @platform_disable: platform specific panel disable function
>> + */
>> +struct panel_generic_dpi_data {
>> + ? ? const char *name;
>> + ? ? int (*platform_enable)(struct omap_dss_device *dssdev);
>> + ? ? void (*platform_disable)(struct omap_dss_device *dssdev);
>> +};
>> +
>> +#endif /* __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H */
>> diff --git a/drivers/video/omap2/displays/Kconfig b/drivers/video/omap2/displays/Kconfig
>> index 12327bb..cb3e339 100644
>> --- a/drivers/video/omap2/displays/Kconfig
>> +++ b/drivers/video/omap2/displays/Kconfig
>> @@ -1,6 +1,14 @@
>> ?menu "OMAP2/3 Display Device Drivers"
>> ? ? ? ? ?depends on OMAP2_DSS
>>
>> +config PANEL_GENERIC_DPI
>> + ? ? ? ?tristate "Generic DPI Panel"
>> + ? ? ? ?help
>> + ? ? ? Generic DPI panel driver.
>> + ? ? ? Supports DVI output for Beagle and OMAP3 SDP.
>> + ? ? ? Supports LCD Panel used in TI SDP3430 and EVM boards,
>> + ? ? ? OMAP3517 EVM boards and CM-T35.
>> +
>> ?config PANEL_GENERIC
>> ? ? ? ? ?tristate "Generic Panel"
>> ? ? ? ? ?help
>> diff --git a/drivers/video/omap2/displays/Makefile b/drivers/video/omap2/displays/Makefile
>> index aa38609..022058c 100644
>> --- a/drivers/video/omap2/displays/Makefile
>> +++ b/drivers/video/omap2/displays/Makefile
>> @@ -1,3 +1,4 @@
>> +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_LQ043T1DG01) += panel-sharp-lq043t1dg01.o
>> diff --git a/drivers/video/omap2/displays/panel-generic-dpi.c b/drivers/video/omap2/displays/panel-generic-dpi.c
>> new file mode 100644
>> index 0000000..7ddd631
>> --- /dev/null
>> +++ b/drivers/video/omap2/displays/panel-generic-dpi.c
>> @@ -0,0 +1,309 @@
>> +/*
>> + * Generic DPI Panels support
>> + *
>> + * Copyright (C) 2010 Canonical Ltd.
>> + * Author: Bryan Wu <bryan.wu@canonical.com>
>> + *
>> + * 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/panel-generic-dpi.h>
>> +
>> +struct panel_config {
>> + ? ? struct omap_video_timings timings;
>> +
>> + ? ? int acbi; ? ? ? /* ac-bias pin transitions per interrupt */
>> + ? ? /* Unit: line clocks */
>> + ? ? int acb; ? ? ? ?/* ac-bias pin frequency */
>> +
>> + ? ? enum omap_panel_config config;
>> +
>> + ? ? /*
>> + ? ? ?* Used to match device to panel configuration
>> + ? ? ?* when use generic panel driver
>> + ? ? ?*/
>> + ? ? const char *name;
>> +};
>> +
>> +/* Panel configurations */
>> +static struct panel_config generic_dpi_panels[] = {
>> + ? ? /* Generic Panel */
>> + ? ? {
>> + ? ? ? ? ? ? {
>> + ? ? ? ? ? ? ? ? ? ? .x_res ? ? ? ? ?= 640,
>> + ? ? ? ? ? ? ? ? ? ? .y_res ? ? ? ? ?= 480,
>> +
>> + ? ? ? ? ? ? ? ? ? ? .pixel_clock ? ?= 23500,
>> +
>> + ? ? ? ? ? ? ? ? ? ? .hfp ? ? ? ? ? ?= 48,
>> + ? ? ? ? ? ? ? ? ? ? .hsw ? ? ? ? ? ?= 32,
>> + ? ? ? ? ? ? ? ? ? ? .hbp ? ? ? ? ? ?= 80,
>> +
>> + ? ? ? ? ? ? ? ? ? ? .vfp ? ? ? ? ? ?= 3,
>> + ? ? ? ? ? ? ? ? ? ? .vsw ? ? ? ? ? ?= 4,
>> + ? ? ? ? ? ? ? ? ? ? .vbp ? ? ? ? ? ?= 7,
>> + ? ? ? ? ? ? },
>> + ? ? ? ? ? ? .acbi ? ? ? ? ? ? ? ? ? = 0x0,
>> + ? ? ? ? ? ? .acb ? ? ? ? ? ? ? ? ? ?= 0x0,
>> + ? ? ? ? ? ? .config ? ? ? ? ? ? ? ? = OMAP_DSS_LCD_TFT,
>> + ? ? ? ? ? ? .name ? ? ? ? ? ? ? ? ? = "generic",
>> + ? ? },
>> +
>> + ? ? /* Sharp LQ043T1DG01 */
>> + ? ? {
>> + ? ? ? ? ? ? {
>> + ? ? ? ? ? ? ? ? ? ? .x_res ? ? ? ? ?= 480,
>> + ? ? ? ? ? ? ? ? ? ? .y_res ? ? ? ? ?= 272,
>> +
>> + ? ? ? ? ? ? ? ? ? ? .pixel_clock ? ?= 9000,
>> +
>> + ? ? ? ? ? ? ? ? ? ? .hsw ? ? ? ? ? ?= 42,
>> + ? ? ? ? ? ? ? ? ? ? .hfp ? ? ? ? ? ?= 3,
>> + ? ? ? ? ? ? ? ? ? ? .hbp ? ? ? ? ? ?= 2,
>> +
>> + ? ? ? ? ? ? ? ? ? ? .vsw ? ? ? ? ? ?= 11,
>> + ? ? ? ? ? ? ? ? ? ? .vfp ? ? ? ? ? ?= 3,
>> + ? ? ? ? ? ? ? ? ? ? .vbp ? ? ? ? ? ?= 2,
>> + ? ? ? ? ? ? },
>> + ? ? ? ? ? ? .acbi ? ? ? ? ? ? ? ? ? = 0x0,
>> + ? ? ? ? ? ? .acb ? ? ? ? ? ? ? ? ? ?= 0x0,
>> + ? ? ? ? ? ? .config ? ? ? ? ? ? ? ? = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
>> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IEO,
>> + ? ? ? ? ? ? .name ? ? ? ? ? ? ? ? ? = "sharp_lq",
>> + ? ? },
>> +
>> + ? ? /* Sharp LS037V7DW01 */
>> + ? ? {
>> + ? ? ? ? ? ? {
>> + ? ? ? ? ? ? ? ? ? ? .x_res ? ? ? ? ?= 480,
>> + ? ? ? ? ? ? ? ? ? ? .y_res ? ? ? ? ?= 640,
>> +
>> + ? ? ? ? ? ? ? ? ? ? .pixel_clock ? ?= 19200,
>> +
>> + ? ? ? ? ? ? ? ? ? ? .hsw ? ? ? ? ? ?= 2,
>> + ? ? ? ? ? ? ? ? ? ? .hfp ? ? ? ? ? ?= 1,
>> + ? ? ? ? ? ? ? ? ? ? .hbp ? ? ? ? ? ?= 28,
>> +
>> + ? ? ? ? ? ? ? ? ? ? .vsw ? ? ? ? ? ?= 1,
>> + ? ? ? ? ? ? ? ? ? ? .vfp ? ? ? ? ? ?= 1,
>> + ? ? ? ? ? ? ? ? ? ? .vbp ? ? ? ? ? ?= 1,
>> + ? ? ? ? ? ? },
>> + ? ? ? ? ? ? .acbi ? ? ? ? ? ? ? ? ? = 0x0,
>> + ? ? ? ? ? ? .acb ? ? ? ? ? ? ? ? ? ?= 0x28,
>> + ? ? ? ? ? ? .config ? ? ? ? ? ? ? ? = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
>> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? OMAP_DSS_LCD_IHS,
>> + ? ? ? ? ? ? .name ? ? ? ? ? ? ? ? ? = "sharp_ls",
>> + ? ? },
>> +
>> + ? ? /* Toppoly TDO35S */
>> + ? ? {
>> + ? ? ? ? ? ? {
>> + ? ? ? ? ? ? ? ? ? ? .x_res ? ? ? ? ?= 480,
>> + ? ? ? ? ? ? ? ? ? ? .y_res ? ? ? ? ?= 640,
>> +
>> + ? ? ? ? ? ? ? ? ? ? .pixel_clock ? ?= 26000,
>> +
>> + ? ? ? ? ? ? ? ? ? ? .hfp ? ? ? ? ? ?= 104,
>> + ? ? ? ? ? ? ? ? ? ? .hsw ? ? ? ? ? ?= 8,
>> + ? ? ? ? ? ? ? ? ? ? .hbp ? ? ? ? ? ?= 8,
>> +
>> + ? ? ? ? ? ? ? ? ? ? .vfp ? ? ? ? ? ?= 4,
>> + ? ? ? ? ? ? ? ? ? ? .vsw ? ? ? ? ? ?= 2,
>> + ? ? ? ? ? ? ? ? ? ? .vbp ? ? ? ? ? ?= 2,
>> + ? ? ? ? ? ? },
>> + ? ? ? ? ? ? .acbi ? ? ? ? ? ? ? ? ? = 0x0,
>> + ? ? ? ? ? ? .acb ? ? ? ? ? ? ? ? ? ?= 0x0,
>> + ? ? ? ? ? ? .config ? ? ? ? ? ? ? ? = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
>> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IPC |
>> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? OMAP_DSS_LCD_ONOFF,
>> + ? ? ? ? ? ? .name ? ? ? ? ? ? ? ? ? = "toppoly_tdo35s",
>> + ? ? },
>> +};
>> +
>> +static inline struct panel_generic_dpi_data
>> +*get_panel_data(const struct omap_dss_device *dssdev)
>> +{
>> + ? ? return (struct panel_generic_dpi_data *) dssdev->data;
>> +}
>> +
>> +
>> +static int generic_dpi_panel_power_on(struct omap_dss_device *dssdev)
>> +{
>> + ? ? int r;
>> + ? ? struct panel_generic_dpi_data *panel_data = get_panel_data(dssdev);
>> +
>> + ? ? if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
>> + ? ? ? ? ? ? return 0;
>> +
>> + ? ? r = omapdss_dpi_display_enable(dssdev);
>> + ? ? if (r)
>> + ? ? ? ? ? ? goto err0;
>> +
>> + ? ? if (panel_data->platform_enable) {
>> + ? ? ? ? ? ? r = panel_data->platform_enable(dssdev);
>> + ? ? ? ? ? ? if (r)
>> + ? ? ? ? ? ? ? ? ? ? goto err1;
>> + ? ? }
>> +
>> + ? ? return 0;
>> +err1:
>> + ? ? omapdss_dpi_display_disable(dssdev);
>> +err0:
>> + ? ? return r;
>> +}
>> +
>> +static void generic_dpi_panel_power_off(struct omap_dss_device *dssdev)
>> +{
>> + ? ? struct panel_generic_dpi_data *panel_data = get_panel_data(dssdev);
>> +
>> + ? ? if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
>> + ? ? ? ? ? ? return;
>> +
>> + ? ? if (panel_data->platform_disable)
>> + ? ? ? ? ? ? panel_data->platform_disable(dssdev);
>> +
>> + ? ? omapdss_dpi_display_disable(dssdev);
>> +}
>
> For both panel power on and off some panels require some sleep times:
> when powering on, the video interface has to be enabled for some time
> before the panel can be enabled, and similarly when powering off the
> video interface needs to be on for some time after the panel has been
> disabled.
>
Actually, in my previous version patches, I introduced .power_on_delay
and .power_off_delay in panel_configs, which contains the sleep value
for msleep(). But Archit told me this is not necessary, so I removed
that.
And I will call this in panel powering on function
+ /* wait couple of vsyncs until enabling the LCD */
+ if (p->power_on_delay)
+ msleep(p->power_on_delay);
+
Is that OK for you?
> See for example sharp_lq driver's power_on/off.
>
> This should be handled similarly that what we have in panel-taal:
> configuration options in the panel_config struct for the sleep times
> (and if it's 0, no sleep done).
>
>> +
>> +static int generic_dpi_panel_probe(struct omap_dss_device *dssdev)
>> +{
>> + ? ? struct panel_generic_dpi_data *panel_data = get_panel_data(dssdev);
>> + ? ? struct panel_config *panel_config = NULL;
>> + ? ? int i;
>> +
>> + ? ? dev_dbg(&dssdev->dev, "probe\n");
>> +
>> + ? ? if (!panel_data || !panel_data->name)
>> + ? ? ? ? ? ? return -EINVAL;
>> +
>> + ? ? for (i = 0; i < ARRAY_SIZE(generic_dpi_panels); i++) {
>> + ? ? ? ? ? ? if (strcmp(panel_data->name, generic_dpi_panels[i].name) == 0) {
>> + ? ? ? ? ? ? ? ? ? ? panel_config = &generic_dpi_panels[i];
>> + ? ? ? ? ? ? ? ? ? ? break;
>> + ? ? ? ? ? ? }
>> + ? ? }
>> +
>> + ? ? if (!panel_config)
>> + ? ? ? ? ? ? return -EINVAL;
>> +
>> + ? ? dssdev->type = OMAP_DISPLAY_TYPE_DPI;
>
> Leave this display type also in to the board file. It defines the
> interface (like the data_lines), not the panel.
>
No problem, I will change that back.
> I think otherwise the patches look good. At some point we should add
> backlight support also, so that we can remove a few drivers more (and
> get rid of the extra backlight stuff in omap_dss_device struct).
>
Yeah, I plan to do that. But IMHO, how about just move those backlight
support as backlight drivers and only remain display control in this
directory.
Thanks a lot,
--
Bryan Wu <bryan.wu@canonical.com>
Kernel Developer ? ?+86.138-1617-6545 Mobile
Ubuntu Kernel Team
Canonical Ltd. ? ? ?www.canonical.com
Ubuntu - Linux for human beings | www.ubuntu.com
^ permalink raw reply [flat|nested] 21+ messages in thread* [PATCH 1/3] OMAP: DSS2: Add generic DPI panel display driver
2010-11-14 1:42 ` Bryan Wu
@ 2010-11-15 4:05 ` Taneja, Archit
2010-11-15 5:33 ` Bryan Wu
2010-11-15 9:16 ` Tomi Valkeinen
1 sibling, 1 reply; 21+ messages in thread
From: Taneja, Archit @ 2010-11-15 4:05 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
bryan.wu at canonical.com wrote:
> On Wed, Nov 10, 2010 at 10:35 PM, Tomi Valkeinen
[snip]
>>
>> For both panel power on and off some panels require some sleep times:
>> when powering on, the video interface has to be enabled for some time
>> before the panel can be enabled, and similarly when powering off the
>> video interface needs to be on for some time after the panel has been
>> disabled.
>>
>
> Actually, in my previous version patches, I introduced
> .power_on_delay and .power_off_delay in panel_configs, which
> contains the sleep value for msleep(). But Archit told me
> this is not necessary, so I removed that.
I had asked you to remove it from omap_dss_device to a more
specific struct for the generic dpi driver :)
It should be in the 'panel_generic_dpi_data' struct now.
Regards,
Archit
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH 1/3] OMAP: DSS2: Add generic DPI panel display driver
2010-11-15 4:05 ` Taneja, Archit
@ 2010-11-15 5:33 ` Bryan Wu
2010-11-15 8:43 ` Taneja, Archit
0 siblings, 1 reply; 21+ messages in thread
From: Bryan Wu @ 2010-11-15 5:33 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Nov 15, 2010 at 12:05 PM, Taneja, Archit <archit@ti.com> wrote:
> Hi,
>
> bryan.wu at canonical.com wrote:
>> On Wed, Nov 10, 2010 at 10:35 PM, Tomi Valkeinen
>
> [snip]
>
>>>
>>> For both panel power on and off some panels require some sleep times:
>>> when powering on, the video interface has to be enabled for some time
>>> before the panel can be enabled, and similarly when powering off the
>>> video interface needs to be on for some time after the panel has been
>>> disabled.
>>>
>>
>> Actually, in my previous version patches, I introduced
>> .power_on_delay and .power_off_delay in panel_configs, which
>> contains the sleep value for msleep(). But Archit told me
>> this is not necessary, so I removed that.
>
> I had asked you to remove it from omap_dss_device to a more
> specific struct for the generic dpi driver :)
>
Yeah, no problem.
> It should be in the 'panel_generic_dpi_data' struct now.
>
I think the delay value is related to panel, which can be found in
sharp_ls and sharp_lq drivers. So it might be in the "panel_configs"
struct?
Thanks,
-Bryan
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH 1/3] OMAP: DSS2: Add generic DPI panel display driver
2010-11-15 5:33 ` Bryan Wu
@ 2010-11-15 8:43 ` Taneja, Archit
0 siblings, 0 replies; 21+ messages in thread
From: Taneja, Archit @ 2010-11-15 8:43 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
Bryan Wu wrote:
> On Mon, Nov 15, 2010 at 12:05 PM, Taneja, Archit
> <archit@ti.com> wrote:
>> Hi,
>>
>> bryan.wu at canonical.com wrote:
>>> On Wed, Nov 10, 2010 at 10:35 PM, Tomi Valkeinen
>>
>> [snip]
>>
>>>>
>>>> For both panel power on and off some panels require some sleep times:
>>>> when powering on, the video interface has to be enabled for some
>>>> time before the panel can be enabled, and similarly when powering
>>>> off the video interface needs to be on for some time after the panel has
>>>> been disabled.
>>>>
>>>
>>> Actually, in my previous version patches, I introduced
>>> .power_on_delay and .power_off_delay in panel_configs, which contains
>>> the sleep value for msleep(). But Archit told me this is not
>>> necessary, so I removed that.
>>
>> I had asked you to remove it from omap_dss_device to a more specific
>> struct for the generic dpi driver :)
>>
>
> Yeah, no problem.
>
>> It should be in the 'panel_generic_dpi_data' struct now.
>>
>
> I think the delay value is related to panel, which can be
> found in sharp_ls and sharp_lq drivers. So it might be in the "panel_configs"
> struct?
Yes, I think that makes more sense.
Thanks,
Archit
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH 1/3] OMAP: DSS2: Add generic DPI panel display driver
2010-11-14 1:42 ` Bryan Wu
2010-11-15 4:05 ` Taneja, Archit
@ 2010-11-15 9:16 ` Tomi Valkeinen
1 sibling, 0 replies; 21+ messages in thread
From: Tomi Valkeinen @ 2010-11-15 9:16 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, 2010-11-14 at 02:42 +0100, ext Bryan Wu wrote:
> On Wed, Nov 10, 2010 at 10:35 PM, Tomi Valkeinen
> <tomi.valkeinen@nokia.com> wrote:
> > Hi,
> >
> > On Tue, 2010-11-09 at 18:12 +0100, ext Bryan Wu wrote:
> >> Generic DPI panel driver includes the driver and 4 similar panel configurations. It
> >> will match the panel name which is passed from platform data and setup the
> >> right configurations.
> >>
> >> With generic DPI panel driver, we can remove those 4 duplicated panel display
> >> drivers. In the future, it is simple for us just add new panel configuration
> >> date in panel-generic-dpi.c to support new display panel.
> >
> > This is looking good, but still a couple of comments inline:
> >
<snip>
> > I think otherwise the patches look good. At some point we should add
> > backlight support also, so that we can remove a few drivers more (and
> > get rid of the extra backlight stuff in omap_dss_device struct).
> >
>
> Yeah, I plan to do that. But IMHO, how about just move those backlight
> support as backlight drivers and only remain display control in this
> directory.
Hmm, yes, perhaps that would work for these DPI panels.
The reason I originally put the backlight driver inside the panel driver
is that there are many panels for which the backlight is a part of the
panel, in the sense that the backlight is controlled by sending messages
to the panel. For these the backlight needs to be somewhat integrated
into the panel driver.
Tomi
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH 2/3] OMAP: use generic DPI panel driver in board files
2010-11-09 17:12 [PATCH 0/3] OMAP: DSS2: introduce generic panel display driver (try #5) Bryan Wu
2010-11-09 17:12 ` [PATCH 1/3] OMAP: DSS2: Add generic DPI panel display driver Bryan Wu
@ 2010-11-09 17:12 ` Bryan Wu
2010-11-09 17:12 ` [PATCH 3/3] OMAP: DSS2: remove generic DPI panel driver duplicated panel drivers Bryan Wu
2 siblings, 0 replies; 21+ messages in thread
From: Bryan Wu @ 2010-11-09 17:12 UTC (permalink / raw)
To: linux-arm-kernel
Still keep sharp_ls_panel, since the sharp_ls_panel driver contains blacklight
control driver code which will be moved out later. Then we can use generic DPI
driver for sharp_ls_panel.
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
---
arch/arm/mach-omap2/board-3430sdp.c | 13 +++++++++----
arch/arm/mach-omap2/board-am3517evm.c | 25 +++++++++++++++++--------
arch/arm/mach-omap2/board-cm-t35.c | 25 +++++++++++++++++--------
arch/arm/mach-omap2/board-devkit8000.c | 28 ++++++++++++++++++----------
arch/arm/mach-omap2/board-igep0020.c | 13 +++++++++----
arch/arm/mach-omap2/board-omap3beagle.c | 13 +++++++++----
arch/arm/mach-omap2/board-omap3evm.c | 13 +++++++++----
arch/arm/mach-omap2/board-omap3stalker.c | 25 +++++++++++++++++--------
8 files changed, 105 insertions(+), 50 deletions(-)
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index 4e3742c..4bafdd7 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -38,6 +38,7 @@
#include <plat/dma.h>
#include <plat/gpmc.h>
#include <plat/display.h>
+#include <plat/panel-generic-dpi.h>
#include <plat/gpmc-smc91x.h>
@@ -270,13 +271,17 @@ static struct omap_dss_device sdp3430_lcd_device = {
.platform_disable = sdp3430_panel_disable_lcd,
};
+static struct panel_generic_dpi_data dvi_panel = {
+ .name = "generic",
+ .platform_enable = sdp3430_panel_enable_dvi,
+ .platform_disable = sdp3430_panel_disable_dvi,
+};
+
static struct omap_dss_device sdp3430_dvi_device = {
.name = "dvi",
- .driver_name = "generic_panel",
- .type = OMAP_DISPLAY_TYPE_DPI,
+ .driver_name = "generic_dpi_panel",
+ .data = &dvi_panel,
.phy.dpi.data_lines = 24,
- .platform_enable = sdp3430_panel_enable_dvi,
- .platform_disable = sdp3430_panel_disable_dvi,
};
static struct omap_dss_device sdp3430_tv_device = {
diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c
index 0739950..3534a23 100644
--- a/arch/arm/mach-omap2/board-am3517evm.c
+++ b/arch/arm/mach-omap2/board-am3517evm.c
@@ -35,6 +35,7 @@
#include <plat/common.h>
#include <plat/usb.h>
#include <plat/display.h>
+#include <plat/panel-generic-dpi.h>
#include "mux.h"
#include "control.h"
@@ -303,13 +304,17 @@ static void am3517_evm_panel_disable_lcd(struct omap_dss_device *dssdev)
lcd_enabled = 0;
}
+static struct panel_generic_dpi_data lcd_panel = {
+ .name = "sharp_lq",
+ .platform_enable = am3517_evm_panel_enable_lcd,
+ .platform_disable = am3517_evm_panel_disable_lcd,
+};
+
static struct omap_dss_device am3517_evm_lcd_device = {
- .type = OMAP_DISPLAY_TYPE_DPI,
.name = "lcd",
- .driver_name = "sharp_lq_panel",
+ .driver_name = "generic_dpi_panel",
+ .data = &lcd_panel,
.phy.dpi.data_lines = 16,
- .platform_enable = am3517_evm_panel_enable_lcd,
- .platform_disable = am3517_evm_panel_disable_lcd,
};
static int am3517_evm_panel_enable_tv(struct omap_dss_device *dssdev)
@@ -346,13 +351,17 @@ static void am3517_evm_panel_disable_dvi(struct omap_dss_device *dssdev)
dvi_enabled = 0;
}
+static struct panel_generic_dpi_data dvi_panel = {
+ .name = "generic",
+ .platform_enable = am3517_evm_panel_enable_dvi,
+ .platform_disable = am3517_evm_panel_disable_dvi,
+};
+
static struct omap_dss_device am3517_evm_dvi_device = {
- .type = OMAP_DISPLAY_TYPE_DPI,
.name = "dvi",
- .driver_name = "generic_panel",
+ .driver_name = "generic_dpi_panel",
+ .data = &dvi_panel,
.phy.dpi.data_lines = 24,
- .platform_enable = am3517_evm_panel_enable_dvi,
- .platform_disable = am3517_evm_panel_disable_dvi,
};
static struct omap_dss_device *am3517_evm_dss_devices[] = {
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index 63f764e..1a69d32 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -46,6 +46,7 @@
#include <plat/gpmc.h>
#include <plat/usb.h>
#include <plat/display.h>
+#include <plat/panel-generic-dpi.h>
#include <plat/mcspi.h>
#include <mach/hardware.h>
@@ -351,22 +352,30 @@ static void cm_t35_panel_disable_tv(struct omap_dss_device *dssdev)
{
}
+static struct panel_generic_dpi_data lcd_panel = {
+ .name = "toppoly_tdo35s",
+ .platform_enable = cm_t35_panel_enable_lcd,
+ .platform_disable = cm_t35_panel_disable_lcd,
+};
+
static struct omap_dss_device cm_t35_lcd_device = {
.name = "lcd",
- .driver_name = "toppoly_tdo35s_panel",
- .type = OMAP_DISPLAY_TYPE_DPI,
+ .driver_name = "generic_dpi_panel",
+ .data = &lcd_panel,
.phy.dpi.data_lines = 18,
- .platform_enable = cm_t35_panel_enable_lcd,
- .platform_disable = cm_t35_panel_disable_lcd,
+};
+
+static struct panel_generic_dpi_data dvi_panel = {
+ .name = "generic",
+ .platform_enable = cm_t35_panel_enable_dvi,
+ .platform_disable = cm_t35_panel_disable_dvi,
};
static struct omap_dss_device cm_t35_dvi_device = {
.name = "dvi",
- .driver_name = "generic_panel",
- .type = OMAP_DISPLAY_TYPE_DPI,
+ .driver_name = "generic_dpi_panel",
+ .data = &dvi_panel,
.phy.dpi.data_lines = 24,
- .platform_enable = cm_t35_panel_enable_dvi,
- .platform_disable = cm_t35_panel_disable_dvi,
};
static struct omap_dss_device cm_t35_tv_device = {
diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c
index 067f437..d3ed32c 100644
--- a/arch/arm/mach-omap2/board-devkit8000.c
+++ b/arch/arm/mach-omap2/board-devkit8000.c
@@ -46,6 +46,7 @@
#include <plat/nand.h>
#include <plat/usb.h>
#include <plat/display.h>
+#include <plat/panel-generic-dpi.h>
#include <plat/mcspi.h>
#include <linux/input/matrix_keypad.h>
@@ -149,23 +150,30 @@ static struct regulator_consumer_supply devkit8000_vmmc1_supply =
static struct regulator_consumer_supply devkit8000_vio_supply =
REGULATOR_SUPPLY("vcc", "spi2.0");
+static struct panel_generic_dpi_data lcd_panel = {
+ .name = "generic",
+ .platform_enable = devkit8000_panel_enable_lcd,
+ .platform_disable = devkit8000_panel_disable_lcd,
+};
+
static struct omap_dss_device devkit8000_lcd_device = {
.name = "lcd",
- .driver_name = "generic_panel",
- .type = OMAP_DISPLAY_TYPE_DPI,
+ .driver_name = "generic_dpi_panel",
+ .data = &lcd_panel,
.phy.dpi.data_lines = 24,
- .reset_gpio = -EINVAL, /* will be replaced */
- .platform_enable = devkit8000_panel_enable_lcd,
- .platform_disable = devkit8000_panel_disable_lcd,
};
+
+static struct panel_generic_dpi_data dvi_panel = {
+ .name = "generic",
+ .platform_enable = devkit8000_panel_enable_dvi,
+ .platform_disable = devkit8000_panel_disable_dvi,
+};
+
static struct omap_dss_device devkit8000_dvi_device = {
.name = "dvi",
- .driver_name = "generic_panel",
- .type = OMAP_DISPLAY_TYPE_DPI,
+ .driver_name = "generic_dpi_panel",
+ .data = &dvi_panel,
.phy.dpi.data_lines = 24,
- .reset_gpio = -EINVAL, /* will be replaced */
- .platform_enable = devkit8000_panel_enable_dvi,
- .platform_disable = devkit8000_panel_disable_dvi,
};
static struct omap_dss_device devkit8000_tv_device = {
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 5e035a5..5d451e2 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -30,6 +30,7 @@
#include <plat/gpmc.h>
#include <plat/usb.h>
#include <plat/display.h>
+#include <plat/panel-generic-dpi.h>
#include <plat/onenand.h>
#include "mux.h"
@@ -433,13 +434,17 @@ static void igep2_disable_dvi(struct omap_dss_device *dssdev)
gpio_direction_output(IGEP2_GPIO_DVI_PUP, 0);
}
+static struct panel_generic_dpi_data dvi_panel = {
+ .name = "generic",
+ .platform_enable = igep2_enable_dvi,
+ .platform_disable = igep2_disable_dvi,
+};
+
static struct omap_dss_device igep2_dvi_device = {
- .type = OMAP_DISPLAY_TYPE_DPI,
.name = "dvi",
- .driver_name = "generic_panel",
+ .driver_name = "generic_dpi_panel",
+ .data = &dvi_panel,
.phy.dpi.data_lines = 24,
- .platform_enable = igep2_enable_dvi,
- .platform_disable = igep2_disable_dvi,
};
static struct omap_dss_device *igep2_dss_devices[] = {
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 14f4224..fe0bd0b 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -41,6 +41,7 @@
#include <plat/board.h>
#include <plat/common.h>
#include <plat/display.h>
+#include <plat/panel-generic-dpi.h>
#include <plat/gpmc.h>
#include <plat/nand.h>
#include <plat/usb.h>
@@ -194,14 +195,18 @@ static void beagle_disable_dvi(struct omap_dss_device *dssdev)
gpio_set_value(dssdev->reset_gpio, 0);
}
+static struct panel_generic_dpi_data dvi_panel = {
+ .name = "generic",
+ .platform_enable = beagle_enable_dvi,
+ .platform_disable = beagle_disable_dvi,
+};
+
static struct omap_dss_device beagle_dvi_device = {
- .type = OMAP_DISPLAY_TYPE_DPI,
.name = "dvi",
- .driver_name = "generic_panel",
+ .driver_name = "generic_dpi_panel",
+ .data = &dvi_panel,
.phy.dpi.data_lines = 24,
.reset_gpio = 170,
- .platform_enable = beagle_enable_dvi,
- .platform_disable = beagle_disable_dvi,
};
static struct omap_dss_device beagle_tv_device = {
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index b04365c..a9c946c 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -43,6 +43,7 @@
#include <plat/common.h>
#include <plat/mcspi.h>
#include <plat/display.h>
+#include <plat/panel-generic-dpi.h>
#include "mux.h"
#include "sdram-micron-mt46h32m32lf-6.h"
@@ -301,13 +302,17 @@ static void omap3_evm_disable_dvi(struct omap_dss_device *dssdev)
dvi_enabled = 0;
}
+static struct panel_generic_dpi_data dvi_panel = {
+ .name = "generic",
+ .platform_enable = omap3_evm_enable_dvi,
+ .platform_disable = omap3_evm_disable_dvi,
+};
+
static struct omap_dss_device omap3_evm_dvi_device = {
.name = "dvi",
- .driver_name = "generic_panel",
- .type = OMAP_DISPLAY_TYPE_DPI,
+ .driver_name = "generic_dpi_panel",
+ .data = &dvi_panel,
.phy.dpi.data_lines = 24,
- .platform_enable = omap3_evm_enable_dvi,
- .platform_disable = omap3_evm_disable_dvi,
};
static struct omap_dss_device *omap3_evm_dss_devices[] = {
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
index f252721..3850bb4 100644
--- a/arch/arm/mach-omap2/board-omap3stalker.c
+++ b/arch/arm/mach-omap2/board-omap3stalker.c
@@ -40,6 +40,7 @@
#include <plat/nand.h>
#include <plat/usb.h>
#include <plat/display.h>
+#include <plat/panel-generic-dpi.h>
#include <plat/mcspi.h>
#include <linux/input/matrix_keypad.h>
@@ -160,13 +161,17 @@ static void omap3_stalker_disable_lcd(struct omap_dss_device *dssdev)
lcd_enabled = 0;
}
+static struct panel_generic_dpi_data lcd_panel = {
+ .name = "generic",
+ .platform_enable = omap3_stalker_enable_lcd,
+ .platform_disable = omap3_stalker_disable_lcd,
+};
+
static struct omap_dss_device omap3_stalker_lcd_device = {
.name = "lcd",
- .driver_name = "generic_panel",
+ .driver_name = "generic_dpi_panel",
+ .data = &lcd_panel,
.phy.dpi.data_lines = 24,
- .type = OMAP_DISPLAY_TYPE_DPI,
- .platform_enable = omap3_stalker_enable_lcd,
- .platform_disable = omap3_stalker_disable_lcd,
};
static int omap3_stalker_enable_tv(struct omap_dss_device *dssdev)
@@ -208,13 +213,17 @@ static void omap3_stalker_disable_dvi(struct omap_dss_device *dssdev)
dvi_enabled = 0;
}
+static struct panel_generic_dpi_data dvi_panel = {
+ .name = "generic",
+ .platform_enable = omap3_stalker_enable_dvi,
+ .platform_disable = omap3_stalker_disable_dvi,
+};
+
static struct omap_dss_device omap3_stalker_dvi_device = {
.name = "dvi",
- .driver_name = "generic_panel",
- .type = OMAP_DISPLAY_TYPE_DPI,
+ .driver_name = "generic_dpi_panel",
+ .data = &dvi_panel,
.phy.dpi.data_lines = 24,
- .platform_enable = omap3_stalker_enable_dvi,
- .platform_disable = omap3_stalker_disable_dvi,
};
static struct omap_dss_device *omap3_stalker_dss_devices[] = {
--
1.7.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 3/3] OMAP: DSS2: remove generic DPI panel driver duplicated panel drivers
2010-11-09 17:12 [PATCH 0/3] OMAP: DSS2: introduce generic panel display driver (try #5) Bryan Wu
2010-11-09 17:12 ` [PATCH 1/3] OMAP: DSS2: Add generic DPI panel display driver Bryan Wu
2010-11-09 17:12 ` [PATCH 2/3] OMAP: use generic DPI panel driver in board files Bryan Wu
@ 2010-11-09 17:12 ` Bryan Wu
2 siblings, 0 replies; 21+ messages in thread
From: Bryan Wu @ 2010-11-09 17:12 UTC (permalink / raw)
To: linux-arm-kernel
Still keep sharp_ls_panel driver, because it contains blacklight control driver.
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
---
drivers/video/omap2/displays/Kconfig | 18 --
drivers/video/omap2/displays/Makefile | 3 -
drivers/video/omap2/displays/panel-generic.c | 174 --------------------
.../video/omap2/displays/panel-sharp-lq043t1dg01.c | 165 -------------------
.../video/omap2/displays/panel-toppoly-tdo35s.c | 164 ------------------
5 files changed, 0 insertions(+), 524 deletions(-)
delete mode 100644 drivers/video/omap2/displays/panel-generic.c
delete mode 100644 drivers/video/omap2/displays/panel-sharp-lq043t1dg01.c
delete mode 100644 drivers/video/omap2/displays/panel-toppoly-tdo35s.c
diff --git a/drivers/video/omap2/displays/Kconfig b/drivers/video/omap2/displays/Kconfig
index cb3e339..9c09afd 100644
--- a/drivers/video/omap2/displays/Kconfig
+++ b/drivers/video/omap2/displays/Kconfig
@@ -9,12 +9,6 @@ config PANEL_GENERIC_DPI
Supports LCD Panel used in TI SDP3430 and EVM boards,
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
tristate "Sharp LS037V7DW01 LCD Panel"
depends on OMAP2_DSS
@@ -22,24 +16,12 @@ config PANEL_SHARP_LS037V7DW01
help
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_TAAL
tristate "Taal DSI Panel"
depends on OMAP2_DSS_DSI
help
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
tristate "TPO TD043MTEA1 LCD Panel"
depends on OMAP2_DSS && SPI
diff --git a/drivers/video/omap2/displays/Makefile b/drivers/video/omap2/displays/Makefile
index 022058c..3bebe4d 100644
--- a/drivers/video/omap2/displays/Makefile
+++ b/drivers/video/omap2/displays/Makefile
@@ -1,9 +1,6 @@
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_LQ043T1DG01) += panel-sharp-lq043t1dg01.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_ACX565AKM) += panel-acx565akm.o
diff --git a/drivers/video/omap2/displays/panel-generic.c b/drivers/video/omap2/displays/panel-generic.c
deleted file mode 100644
index 395a68d..0000000
--- a/drivers/video/omap2/displays/panel-generic.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * 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");
diff --git a/drivers/video/omap2/displays/panel-sharp-lq043t1dg01.c b/drivers/video/omap2/displays/panel-sharp-lq043t1dg01.c
deleted file mode 100644
index 0c6896c..0000000
--- a/drivers/video/omap2/displays/panel-sharp-lq043t1dg01.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * 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");
diff --git a/drivers/video/omap2/displays/panel-toppoly-tdo35s.c b/drivers/video/omap2/displays/panel-toppoly-tdo35s.c
deleted file mode 100644
index 526e906..0000000
--- a/drivers/video/omap2/displays/panel-toppoly-tdo35s.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * 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");
--
1.7.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 1/3] OMAP: DSS2: Add generic DPI panel display driver
2010-11-17 13:34 [PATCH 0/3] OMAP: DSS2: introduce generic panel display driver (try #8) Bryan Wu
@ 2010-11-17 13:34 ` Bryan Wu
2010-11-17 16:13 ` Premi, Sanjeev
0 siblings, 1 reply; 21+ messages in thread
From: Bryan Wu @ 2010-11-17 13:34 UTC (permalink / raw)
To: linux-arm-kernel
Generic DPI panel driver includes the driver and 4 similar panel configurations. It
will match the panel name which is passed from platform data and setup the
right configurations.
With generic DPI panel driver, we can remove those 4 duplicated panel display
drivers. In the future, it is simple for us just add new panel configuration
date in panel-generic-dpi.c to support new display panel.
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
---
.../arm/plat-omap/include/plat/panel-generic-dpi.h | 37 ++
drivers/video/omap2/displays/Kconfig | 8 +
drivers/video/omap2/displays/Makefile | 1 +
drivers/video/omap2/displays/panel-generic-dpi.c | 355 ++++++++++++++++++++
4 files changed, 401 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/plat-omap/include/plat/panel-generic-dpi.h
create mode 100644 drivers/video/omap2/displays/panel-generic-dpi.c
diff --git a/arch/arm/plat-omap/include/plat/panel-generic-dpi.h b/arch/arm/plat-omap/include/plat/panel-generic-dpi.h
new file mode 100644
index 0000000..7906197
--- /dev/null
+++ b/arch/arm/plat-omap/include/plat/panel-generic-dpi.h
@@ -0,0 +1,37 @@
+/*
+ * Header for generic DPI panel driver
+ *
+ * Copyright (C) 2010 Canonical Ltd.
+ * Author: Bryan Wu <bryan.wu@canonical.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/>.
+ */
+
+#ifndef __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H
+#define __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H
+
+#include "display.h"
+
+/**
+ * struct panel_generic_dpi_data - panel driver configuration data
+ * @name: panel name
+ * @platform_enable: platform specific panel enable function
+ * @platform_disable: platform specific panel disable function
+ */
+struct panel_generic_dpi_data {
+ const char *name;
+ int (*platform_enable)(struct omap_dss_device *dssdev);
+ void (*platform_disable)(struct omap_dss_device *dssdev);
+};
+
+#endif /* __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H */
diff --git a/drivers/video/omap2/displays/Kconfig b/drivers/video/omap2/displays/Kconfig
index 12327bb..cb3e339 100644
--- a/drivers/video/omap2/displays/Kconfig
+++ b/drivers/video/omap2/displays/Kconfig
@@ -1,6 +1,14 @@
menu "OMAP2/3 Display Device Drivers"
depends on OMAP2_DSS
+config PANEL_GENERIC_DPI
+ tristate "Generic DPI Panel"
+ help
+ Generic DPI panel driver.
+ Supports DVI output for Beagle and OMAP3 SDP.
+ Supports LCD Panel used in TI SDP3430 and EVM boards,
+ OMAP3517 EVM boards and CM-T35.
+
config PANEL_GENERIC
tristate "Generic Panel"
help
diff --git a/drivers/video/omap2/displays/Makefile b/drivers/video/omap2/displays/Makefile
index aa38609..022058c 100644
--- a/drivers/video/omap2/displays/Makefile
+++ b/drivers/video/omap2/displays/Makefile
@@ -1,3 +1,4 @@
+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_LQ043T1DG01) += panel-sharp-lq043t1dg01.o
diff --git a/drivers/video/omap2/displays/panel-generic-dpi.c b/drivers/video/omap2/displays/panel-generic-dpi.c
new file mode 100644
index 0000000..6702cf6
--- /dev/null
+++ b/drivers/video/omap2/displays/panel-generic-dpi.c
@@ -0,0 +1,355 @@
+/*
+ * Generic DPI Panels support
+ *
+ * Copyright (C) 2010 Canonical Ltd.
+ * Author: Bryan Wu <bryan.wu@canonical.com>
+ *
+ * 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 <linux/slab.h>
+
+#include <plat/panel-generic-dpi.h>
+
+struct panel_config {
+ struct omap_video_timings timings;
+
+ int acbi; /* ac-bias pin transitions per interrupt */
+ /* Unit: line clocks */
+ int acb; /* ac-bias pin frequency */
+
+ enum omap_panel_config config;
+
+ int power_on_delay;
+ int power_off_delay;
+
+ /*
+ * Used to match device to panel configuration
+ * when use generic panel driver
+ */
+ const char *name;
+};
+
+/* Panel configurations */
+static struct panel_config generic_dpi_panels[] = {
+ /* Generic Panel */
+ {
+ {
+ .x_res = 640,
+ .y_res = 480,
+
+ .pixel_clock = 23500,
+
+ .hfp = 48,
+ .hsw = 32,
+ .hbp = 80,
+
+ .vfp = 3,
+ .vsw = 4,
+ .vbp = 7,
+ },
+ .acbi = 0x0,
+ .acb = 0x0,
+ .config = OMAP_DSS_LCD_TFT,
+ .power_on_delay = 0,
+ .power_off_delay = 0,
+ .name = "generic",
+ },
+
+ /* Sharp LQ043T1DG01 */
+ {
+ {
+ .x_res = 480,
+ .y_res = 272,
+
+ .pixel_clock = 9000,
+
+ .hsw = 42,
+ .hfp = 3,
+ .hbp = 2,
+
+ .vsw = 11,
+ .vfp = 3,
+ .vbp = 2,
+ },
+ .acbi = 0x0,
+ .acb = 0x0,
+ .config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+ OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IEO,
+ .power_on_delay = 50,
+ .power_off_delay = 100,
+ .name = "sharp_lq",
+ },
+
+ /* Sharp LS037V7DW01 */
+ {
+ {
+ .x_res = 480,
+ .y_res = 640,
+
+ .pixel_clock = 19200,
+
+ .hsw = 2,
+ .hfp = 1,
+ .hbp = 28,
+
+ .vsw = 1,
+ .vfp = 1,
+ .vbp = 1,
+ },
+ .acbi = 0x0,
+ .acb = 0x28,
+ .config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+ OMAP_DSS_LCD_IHS,
+ .power_on_delay = 50,
+ .power_off_delay = 100,
+ .name = "sharp_ls",
+ },
+
+ /* Toppoly TDO35S */
+ {
+ {
+ .x_res = 480,
+ .y_res = 640,
+
+ .pixel_clock = 26000,
+
+ .hfp = 104,
+ .hsw = 8,
+ .hbp = 8,
+
+ .vfp = 4,
+ .vsw = 2,
+ .vbp = 2,
+ },
+ .acbi = 0x0,
+ .acb = 0x0,
+ .config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+ OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IPC |
+ OMAP_DSS_LCD_ONOFF,
+ .power_on_delay = 0,
+ .power_off_delay = 0,
+ .name = "toppoly_tdo35s",
+ },
+};
+
+struct panel_drv_data {
+
+ struct omap_dss_device *dssdev;
+
+ struct panel_config *panel_config;
+};
+
+static inline struct panel_generic_dpi_data
+*get_panel_data(const struct omap_dss_device *dssdev)
+{
+ return (struct panel_generic_dpi_data *) dssdev->data;
+}
+
+static int generic_dpi_panel_power_on(struct omap_dss_device *dssdev)
+{
+ int r;
+ struct panel_generic_dpi_data *panel_data = get_panel_data(dssdev);
+ struct panel_drv_data *drv_data = dev_get_drvdata(&dssdev->dev);
+ struct panel_config *panel_config = drv_data->panel_config;
+
+ 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 */
+ if (panel_config->power_on_delay)
+ msleep(panel_config->power_on_delay);
+
+ if (panel_data->platform_enable) {
+ r = panel_data->platform_enable(dssdev);
+ if (r)
+ goto err1;
+ }
+
+ return 0;
+err1:
+ omapdss_dpi_display_disable(dssdev);
+err0:
+ return r;
+}
+
+static void generic_dpi_panel_power_off(struct omap_dss_device *dssdev)
+{
+ struct panel_generic_dpi_data *panel_data = get_panel_data(dssdev);
+ struct panel_drv_data *drv_data = dev_get_drvdata(&dssdev->dev);
+ struct panel_config *panel_config = drv_data->panel_config;
+
+ if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
+ return;
+
+ if (panel_data->platform_disable)
+ panel_data->platform_disable(dssdev);
+
+ /* wait couple of vsyncs after disabling the LCD */
+ if (panel_config->power_off_delay)
+ msleep(panel_config->power_off_delay);
+
+ omapdss_dpi_display_disable(dssdev);
+}
+
+static int generic_dpi_panel_probe(struct omap_dss_device *dssdev)
+{
+ struct panel_generic_dpi_data *panel_data = get_panel_data(dssdev);
+ struct panel_config *panel_config = NULL;
+ struct panel_drv_data *drv_data = NULL;
+ int i;
+
+ dev_dbg(&dssdev->dev, "probe\n");
+
+ if (!panel_data || !panel_data->name)
+ return -EINVAL;
+
+ for (i = 0; i < ARRAY_SIZE(generic_dpi_panels); i++) {
+ if (strcmp(panel_data->name, generic_dpi_panels[i].name) == 0) {
+ panel_config = &generic_dpi_panels[i];
+ break;
+ }
+ }
+
+ if (!panel_config)
+ return -EINVAL;
+
+ dssdev->panel.config = panel_config->config;
+ dssdev->panel.timings = panel_config->timings;
+ dssdev->panel.acb = panel_config->acb;
+ dssdev->panel.acbi = panel_config->acbi;
+
+ drv_data = kzalloc(sizeof(*drv_data), GFP_KERNEL);
+ if (!drv_data)
+ return -ENOMEM;
+
+ drv_data->dssdev = dssdev;
+ drv_data->panel_config = panel_config;
+
+ dev_set_drvdata(&dssdev->dev, drv_data);
+
+ return 0;
+}
+
+static void generic_dpi_panel_remove(struct omap_dss_device *dssdev)
+{
+ struct panel_drv_data *drv_data = dev_get_drvdata(&dssdev->dev);
+
+ dev_dbg(&dssdev->dev, "remove\n");
+
+ kfree(drv_data);
+
+ dev_set_drvdata(&dssdev->dev, NULL);
+}
+
+static int generic_dpi_panel_enable(struct omap_dss_device *dssdev)
+{
+ int r = 0;
+
+ r = generic_dpi_panel_power_on(dssdev);
+ if (r)
+ return r;
+
+ dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+ return 0;
+}
+
+static void generic_dpi_panel_disable(struct omap_dss_device *dssdev)
+{
+ generic_dpi_panel_power_off(dssdev);
+
+ dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
+}
+
+static int generic_dpi_panel_suspend(struct omap_dss_device *dssdev)
+{
+ generic_dpi_panel_power_off(dssdev);
+
+ dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
+
+ return 0;
+}
+
+static int generic_dpi_panel_resume(struct omap_dss_device *dssdev)
+{
+ int r = 0;
+
+ r = generic_dpi_panel_power_on(dssdev);
+ if (r)
+ return r;
+
+ dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+ return 0;
+}
+
+static void generic_dpi_panel_set_timings(struct omap_dss_device *dssdev,
+ struct omap_video_timings *timings)
+{
+ dpi_set_timings(dssdev, timings);
+}
+
+static void generic_dpi_panel_get_timings(struct omap_dss_device *dssdev,
+ struct omap_video_timings *timings)
+{
+ *timings = dssdev->panel.timings;
+}
+
+static int generic_dpi_panel_check_timings(struct omap_dss_device *dssdev,
+ struct omap_video_timings *timings)
+{
+ return dpi_check_timings(dssdev, timings);
+}
+
+static struct omap_dss_driver dpi_driver = {
+ .probe = generic_dpi_panel_probe,
+ .remove = generic_dpi_panel_remove,
+
+ .enable = generic_dpi_panel_enable,
+ .disable = generic_dpi_panel_disable,
+ .suspend = generic_dpi_panel_suspend,
+ .resume = generic_dpi_panel_resume,
+
+ .set_timings = generic_dpi_panel_set_timings,
+ .get_timings = generic_dpi_panel_get_timings,
+ .check_timings = generic_dpi_panel_check_timings,
+
+ .driver = {
+ .name = "generic_dpi_panel",
+ .owner = THIS_MODULE,
+ },
+};
+
+static int __init generic_dpi_panel_drv_init(void)
+{
+ return omap_dss_register_driver(&dpi_driver);
+}
+
+static void __exit generic_dpi_panel_drv_exit(void)
+{
+ omap_dss_unregister_driver(&dpi_driver);
+}
+
+module_init(generic_dpi_panel_drv_init);
+module_exit(generic_dpi_panel_drv_exit);
+MODULE_LICENSE("GPL");
--
1.7.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 1/3] OMAP: DSS2: Add generic DPI panel display driver
2010-11-17 13:34 ` [PATCH 1/3] OMAP: DSS2: Add generic DPI panel display driver Bryan Wu
@ 2010-11-17 16:13 ` Premi, Sanjeev
2010-11-18 1:00 ` Bryan Wu
0 siblings, 1 reply; 21+ messages in thread
From: Premi, Sanjeev @ 2010-11-17 16:13 UTC (permalink / raw)
To: linux-arm-kernel
> -----Original Message-----
> From: linux-omap-owner at vger.kernel.org
> [mailto:linux-omap-owner at vger.kernel.org] On Behalf Of Bryan Wu
> Sent: Wednesday, November 17, 2010 7:05 PM
> To: tomi.valkeinen at nokia.com; linux-omap at vger.kernel.org;
> linux-arm-kernel at lists.infradead.org; Gadiyar, Anand
> Subject: [PATCH 1/3] OMAP: DSS2: Add generic DPI panel display driver
>
> Generic DPI panel driver includes the driver and 4 similar
> panel configurations. It
> will match the panel name which is passed from platform data
> and setup the
> right configurations.
>
> With generic DPI panel driver, we can remove those 4
> duplicated panel display
> drivers. In the future, it is simple for us just add new
> panel configuration
> date in panel-generic-dpi.c to support new display panel.
>
> Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
> ---
> .../arm/plat-omap/include/plat/panel-generic-dpi.h | 37 ++
> drivers/video/omap2/displays/Kconfig | 8 +
> drivers/video/omap2/displays/Makefile | 1 +
> drivers/video/omap2/displays/panel-generic-dpi.c | 355
> ++++++++++++++++++++
> 4 files changed, 401 insertions(+), 0 deletions(-)
> create mode 100644
> arch/arm/plat-omap/include/plat/panel-generic-dpi.h
> create mode 100644 drivers/video/omap2/displays/panel-generic-dpi.c
>
> diff --git
> a/arch/arm/plat-omap/include/plat/panel-generic-dpi.h
> b/arch/arm/plat-omap/include/plat/panel-generic-dpi.h
> new file mode 100644
> index 0000000..7906197
> --- /dev/null
> +++ b/arch/arm/plat-omap/include/plat/panel-generic-dpi.h
> @@ -0,0 +1,37 @@
> +/*
> + * Header for generic DPI panel driver
> + *
> + * Copyright (C) 2010 Canonical Ltd.
> + * Author: Bryan Wu <bryan.wu@canonical.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/>.
> + */
> +
> +#ifndef __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H
> +#define __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H
> +
> +#include "display.h"
> +
> +/**
> + * struct panel_generic_dpi_data - panel driver configuration data
> + * @name: panel name
> + * @platform_enable: platform specific panel enable function
> + * @platform_disable: platform specific panel disable function
> + */
> +struct panel_generic_dpi_data {
> + const char *name;
> + int (*platform_enable)(struct omap_dss_device *dssdev);
> + void (*platform_disable)(struct omap_dss_device *dssdev);
> +};
> +
> +#endif /* __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H */
> diff --git a/drivers/video/omap2/displays/Kconfig
> b/drivers/video/omap2/displays/Kconfig
> index 12327bb..cb3e339 100644
> --- a/drivers/video/omap2/displays/Kconfig
> +++ b/drivers/video/omap2/displays/Kconfig
> @@ -1,6 +1,14 @@
> menu "OMAP2/3 Display Device Drivers"
> depends on OMAP2_DSS
>
> +config PANEL_GENERIC_DPI
> + tristate "Generic DPI Panel"
> + help
> + Generic DPI panel driver.
> + Supports DVI output for Beagle and OMAP3 SDP.
> + Supports LCD Panel used in TI SDP3430 and EVM boards,
> + OMAP3517 EVM boards and CM-T35.
> +
> config PANEL_GENERIC
> tristate "Generic Panel"
> help
> diff --git a/drivers/video/omap2/displays/Makefile
> b/drivers/video/omap2/displays/Makefile
> index aa38609..022058c 100644
> --- a/drivers/video/omap2/displays/Makefile
> +++ b/drivers/video/omap2/displays/Makefile
> @@ -1,3 +1,4 @@
> +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_LQ043T1DG01) += panel-sharp-lq043t1dg01.o
> diff --git a/drivers/video/omap2/displays/panel-generic-dpi.c
> b/drivers/video/omap2/displays/panel-generic-dpi.c
> new file mode 100644
> index 0000000..6702cf6
> --- /dev/null
> +++ b/drivers/video/omap2/displays/panel-generic-dpi.c
> @@ -0,0 +1,355 @@
> +/*
> + * Generic DPI Panels support
> + *
> + * Copyright (C) 2010 Canonical Ltd.
> + * Author: Bryan Wu <bryan.wu@canonical.com>
> + *
> + * Copyright (C) 2008 Nokia Corporation
> + * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
> + *
[sp] Shouldn't all authors (from the files being coalesced) be
listed here.
I see this missing from PATCH3/3 in your series:
[quote]
- * LCD panel driver for Sharp LQ043T1DG01
- *
- * Copyright (C) 2009 Texas Instruments Inc
- * Author: Vaibhav Hiremath <hvaibhav@ti.com>
- *
[/quote]
[snip]...[snip]
^ permalink raw reply [flat|nested] 21+ messages in thread* [PATCH 1/3] OMAP: DSS2: Add generic DPI panel display driver
2010-11-17 16:13 ` Premi, Sanjeev
@ 2010-11-18 1:00 ` Bryan Wu
0 siblings, 0 replies; 21+ messages in thread
From: Bryan Wu @ 2010-11-18 1:00 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Nov 18, 2010 at 12:13 AM, Premi, Sanjeev <premi@ti.com> wrote:
>> -----Original Message-----
>> From: linux-omap-owner at vger.kernel.org
>> [mailto:linux-omap-owner at vger.kernel.org] On Behalf Of Bryan Wu
>> Sent: Wednesday, November 17, 2010 7:05 PM
>> To: tomi.valkeinen at nokia.com; linux-omap at vger.kernel.org;
>> linux-arm-kernel at lists.infradead.org; Gadiyar, Anand
>> Subject: [PATCH 1/3] OMAP: DSS2: Add generic DPI panel display driver
>>
>> Generic DPI panel driver includes the driver and 4 similar
>> panel configurations. It
>> will match the panel name which is passed from platform data
>> and setup the
>> right configurations.
>>
>> With generic DPI panel driver, we can remove those 4
>> duplicated panel display
>> drivers. In the future, it is simple for us just add new
>> panel configuration
>> date in panel-generic-dpi.c to support new display panel.
>>
>> Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
>> ---
>> ?.../arm/plat-omap/include/plat/panel-generic-dpi.h | ? 37 ++
>> ?drivers/video/omap2/displays/Kconfig ? ? ? ? ? ? ? | ? ?8 +
>> ?drivers/video/omap2/displays/Makefile ? ? ? ? ? ? ?| ? ?1 +
>> ?drivers/video/omap2/displays/panel-generic-dpi.c ? | ?355
>> ++++++++++++++++++++
>> ?4 files changed, 401 insertions(+), 0 deletions(-)
>> ?create mode 100644
>> arch/arm/plat-omap/include/plat/panel-generic-dpi.h
>> ?create mode 100644 drivers/video/omap2/displays/panel-generic-dpi.c
>>
>> diff --git
>> a/arch/arm/plat-omap/include/plat/panel-generic-dpi.h
>> b/arch/arm/plat-omap/include/plat/panel-generic-dpi.h
>> new file mode 100644
>> index 0000000..7906197
>> --- /dev/null
>> +++ b/arch/arm/plat-omap/include/plat/panel-generic-dpi.h
>> @@ -0,0 +1,37 @@
>> +/*
>> + * Header for generic DPI panel driver
>> + *
>> + * Copyright (C) 2010 Canonical Ltd.
>> + * Author: Bryan Wu <bryan.wu@canonical.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/>.
>> + */
>> +
>> +#ifndef __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H
>> +#define __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H
>> +
>> +#include "display.h"
>> +
>> +/**
>> + * struct panel_generic_dpi_data - panel driver configuration data
>> + * @name: panel name
>> + * @platform_enable: platform specific panel enable function
>> + * @platform_disable: platform specific panel disable function
>> + */
>> +struct panel_generic_dpi_data {
>> + ? ? const char *name;
>> + ? ? int (*platform_enable)(struct omap_dss_device *dssdev);
>> + ? ? void (*platform_disable)(struct omap_dss_device *dssdev);
>> +};
>> +
>> +#endif /* __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H */
>> diff --git a/drivers/video/omap2/displays/Kconfig
>> b/drivers/video/omap2/displays/Kconfig
>> index 12327bb..cb3e339 100644
>> --- a/drivers/video/omap2/displays/Kconfig
>> +++ b/drivers/video/omap2/displays/Kconfig
>> @@ -1,6 +1,14 @@
>> ?menu "OMAP2/3 Display Device Drivers"
>> ? ? ? ? ?depends on OMAP2_DSS
>>
>> +config PANEL_GENERIC_DPI
>> + ? ? ? ?tristate "Generic DPI Panel"
>> + ? ? ? ?help
>> + ? ? ? Generic DPI panel driver.
>> + ? ? ? Supports DVI output for Beagle and OMAP3 SDP.
>> + ? ? ? Supports LCD Panel used in TI SDP3430 and EVM boards,
>> + ? ? ? OMAP3517 EVM boards and CM-T35.
>> +
>> ?config PANEL_GENERIC
>> ? ? ? ? ?tristate "Generic Panel"
>> ? ? ? ? ?help
>> diff --git a/drivers/video/omap2/displays/Makefile
>> b/drivers/video/omap2/displays/Makefile
>> index aa38609..022058c 100644
>> --- a/drivers/video/omap2/displays/Makefile
>> +++ b/drivers/video/omap2/displays/Makefile
>> @@ -1,3 +1,4 @@
>> +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_LQ043T1DG01) += panel-sharp-lq043t1dg01.o
>> diff --git a/drivers/video/omap2/displays/panel-generic-dpi.c
>> b/drivers/video/omap2/displays/panel-generic-dpi.c
>> new file mode 100644
>> index 0000000..6702cf6
>> --- /dev/null
>> +++ b/drivers/video/omap2/displays/panel-generic-dpi.c
>> @@ -0,0 +1,355 @@
>> +/*
>> + * Generic DPI Panels support
>> + *
>> + * Copyright (C) 2010 Canonical Ltd.
>> + * Author: Bryan Wu <bryan.wu@canonical.com>
>> + *
>> + * Copyright (C) 2008 Nokia Corporation
>> + * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
>> + *
>
> [sp] Shouldn't all authors (from the files being coalesced) be
> ? ? listed here.
>
No problem, I will provide an incremental patch for Tomi.
-Bryan
> ? ? I see this missing from PATCH3/3 in your series:
>
> [quote]
> - * LCD panel driver for Sharp LQ043T1DG01
> - *
> - * Copyright (C) 2009 Texas Instruments Inc
> - * Author: Vaibhav Hiremath <hvaibhav@ti.com>
> - *
> [/quote]
>
>
> [snip]...[snip]
>
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH 1/3] OMAP: DSS2: Add generic DPI panel display driver
2010-11-17 2:23 [PATCH 0/3] OMAP: DSS2: introduce generic panel display driver (try #7) Bryan Wu
@ 2010-11-17 2:23 ` Bryan Wu
2010-11-17 12:44 ` Tomi Valkeinen
0 siblings, 1 reply; 21+ messages in thread
From: Bryan Wu @ 2010-11-17 2:23 UTC (permalink / raw)
To: linux-arm-kernel
Generic DPI panel driver includes the driver and 4 similar panel configurations. It
will match the panel name which is passed from platform data and setup the
right configurations.
With generic DPI panel driver, we can remove those 4 duplicated panel display
drivers. In the future, it is simple for us just add new panel configuration
date in panel-generic-dpi.c to support new display panel.
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
---
.../arm/plat-omap/include/plat/panel-generic-dpi.h | 37 ++
drivers/video/omap2/displays/Kconfig | 8 +
drivers/video/omap2/displays/Makefile | 1 +
drivers/video/omap2/displays/panel-generic-dpi.c | 348 ++++++++++++++++++++
4 files changed, 394 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/plat-omap/include/plat/panel-generic-dpi.h
create mode 100644 drivers/video/omap2/displays/panel-generic-dpi.c
diff --git a/arch/arm/plat-omap/include/plat/panel-generic-dpi.h b/arch/arm/plat-omap/include/plat/panel-generic-dpi.h
new file mode 100644
index 0000000..7906197
--- /dev/null
+++ b/arch/arm/plat-omap/include/plat/panel-generic-dpi.h
@@ -0,0 +1,37 @@
+/*
+ * Header for generic DPI panel driver
+ *
+ * Copyright (C) 2010 Canonical Ltd.
+ * Author: Bryan Wu <bryan.wu@canonical.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/>.
+ */
+
+#ifndef __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H
+#define __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H
+
+#include "display.h"
+
+/**
+ * struct panel_generic_dpi_data - panel driver configuration data
+ * @name: panel name
+ * @platform_enable: platform specific panel enable function
+ * @platform_disable: platform specific panel disable function
+ */
+struct panel_generic_dpi_data {
+ const char *name;
+ int (*platform_enable)(struct omap_dss_device *dssdev);
+ void (*platform_disable)(struct omap_dss_device *dssdev);
+};
+
+#endif /* __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H */
diff --git a/drivers/video/omap2/displays/Kconfig b/drivers/video/omap2/displays/Kconfig
index 12327bb..cb3e339 100644
--- a/drivers/video/omap2/displays/Kconfig
+++ b/drivers/video/omap2/displays/Kconfig
@@ -1,6 +1,14 @@
menu "OMAP2/3 Display Device Drivers"
depends on OMAP2_DSS
+config PANEL_GENERIC_DPI
+ tristate "Generic DPI Panel"
+ help
+ Generic DPI panel driver.
+ Supports DVI output for Beagle and OMAP3 SDP.
+ Supports LCD Panel used in TI SDP3430 and EVM boards,
+ OMAP3517 EVM boards and CM-T35.
+
config PANEL_GENERIC
tristate "Generic Panel"
help
diff --git a/drivers/video/omap2/displays/Makefile b/drivers/video/omap2/displays/Makefile
index aa38609..022058c 100644
--- a/drivers/video/omap2/displays/Makefile
+++ b/drivers/video/omap2/displays/Makefile
@@ -1,3 +1,4 @@
+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_LQ043T1DG01) += panel-sharp-lq043t1dg01.o
diff --git a/drivers/video/omap2/displays/panel-generic-dpi.c b/drivers/video/omap2/displays/panel-generic-dpi.c
new file mode 100644
index 0000000..1f208e3
--- /dev/null
+++ b/drivers/video/omap2/displays/panel-generic-dpi.c
@@ -0,0 +1,348 @@
+/*
+ * Generic DPI Panels support
+ *
+ * Copyright (C) 2010 Canonical Ltd.
+ * Author: Bryan Wu <bryan.wu@canonical.com>
+ *
+ * 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 <linux/slab.h>
+
+#include <plat/panel-generic-dpi.h>
+
+struct panel_config {
+ struct omap_video_timings timings;
+
+ int acbi; /* ac-bias pin transitions per interrupt */
+ /* Unit: line clocks */
+ int acb; /* ac-bias pin frequency */
+
+ enum omap_panel_config config;
+
+ int power_on_delay;
+ int power_off_delay;
+
+ /*
+ * Used to match device to panel configuration
+ * when use generic panel driver
+ */
+ const char *name;
+};
+
+/* Panel configurations */
+static struct panel_config generic_dpi_panels[] = {
+ /* Generic Panel */
+ {
+ {
+ .x_res = 640,
+ .y_res = 480,
+
+ .pixel_clock = 23500,
+
+ .hfp = 48,
+ .hsw = 32,
+ .hbp = 80,
+
+ .vfp = 3,
+ .vsw = 4,
+ .vbp = 7,
+ },
+ .acbi = 0x0,
+ .acb = 0x0,
+ .config = OMAP_DSS_LCD_TFT,
+ .power_on_delay = 0,
+ .power_off_delay = 0,
+ .name = "generic",
+ },
+
+ /* Sharp LQ043T1DG01 */
+ {
+ {
+ .x_res = 480,
+ .y_res = 272,
+
+ .pixel_clock = 9000,
+
+ .hsw = 42,
+ .hfp = 3,
+ .hbp = 2,
+
+ .vsw = 11,
+ .vfp = 3,
+ .vbp = 2,
+ },
+ .acbi = 0x0,
+ .acb = 0x0,
+ .config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+ OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IEO,
+ .power_on_delay = 50,
+ .power_off_delay = 100,
+ .name = "sharp_lq",
+ },
+
+ /* Sharp LS037V7DW01 */
+ {
+ {
+ .x_res = 480,
+ .y_res = 640,
+
+ .pixel_clock = 19200,
+
+ .hsw = 2,
+ .hfp = 1,
+ .hbp = 28,
+
+ .vsw = 1,
+ .vfp = 1,
+ .vbp = 1,
+ },
+ .acbi = 0x0,
+ .acb = 0x28,
+ .config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+ OMAP_DSS_LCD_IHS,
+ .power_on_delay = 50,
+ .power_off_delay = 100,
+ .name = "sharp_ls",
+ },
+
+ /* Toppoly TDO35S */
+ {
+ {
+ .x_res = 480,
+ .y_res = 640,
+
+ .pixel_clock = 26000,
+
+ .hfp = 104,
+ .hsw = 8,
+ .hbp = 8,
+
+ .vfp = 4,
+ .vsw = 2,
+ .vbp = 2,
+ },
+ .acbi = 0x0,
+ .acb = 0x0,
+ .config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+ OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IPC |
+ OMAP_DSS_LCD_ONOFF,
+ .power_on_delay = 0,
+ .power_off_delay = 0,
+ .name = "toppoly_tdo35s",
+ },
+};
+
+struct panel_drv_data {
+
+ struct omap_dss_device *dssdev;
+
+ struct panel_config *panel_config;
+};
+
+static inline struct panel_generic_dpi_data
+*get_panel_data(const struct omap_dss_device *dssdev)
+{
+ return (struct panel_generic_dpi_data *) dssdev->data;
+}
+
+static int generic_dpi_panel_power_on(struct omap_dss_device *dssdev)
+{
+ int r;
+ struct panel_generic_dpi_data *panel_data = get_panel_data(dssdev);
+ struct panel_drv_data *drv_data = dev_get_drvdata(&dssdev->dev);
+ struct panel_config *panel_config = drv_data->panel_config;
+
+ 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 */
+ if (panel_config->power_on_delay)
+ msleep(panel_config->power_on_delay);
+
+ if (panel_data->platform_enable) {
+ r = panel_data->platform_enable(dssdev);
+ if (r)
+ goto err1;
+ }
+
+ return 0;
+err1:
+ omapdss_dpi_display_disable(dssdev);
+err0:
+ return r;
+}
+
+static void generic_dpi_panel_power_off(struct omap_dss_device *dssdev)
+{
+ struct panel_generic_dpi_data *panel_data = get_panel_data(dssdev);
+ struct panel_drv_data *drv_data = dev_get_drvdata(&dssdev->dev);
+ struct panel_config *panel_config = drv_data->panel_config;
+
+ if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
+ return;
+
+ if (panel_data->platform_disable)
+ panel_data->platform_disable(dssdev);
+
+ /* wait couple of vsyncs after disabling the LCD */
+ if (panel_config->power_off_delay)
+ msleep(panel_config->power_off_delay);
+
+ omapdss_dpi_display_disable(dssdev);
+}
+
+static int generic_dpi_panel_probe(struct omap_dss_device *dssdev)
+{
+ struct panel_generic_dpi_data *panel_data = get_panel_data(dssdev);
+ struct panel_config *panel_config = NULL;
+ struct panel_drv_data *drv_data = NULL;
+ int i;
+
+ dev_dbg(&dssdev->dev, "probe\n");
+
+ if (!panel_data || !panel_data->name)
+ return -EINVAL;
+
+ for (i = 0; i < ARRAY_SIZE(generic_dpi_panels); i++) {
+ if (strcmp(panel_data->name, generic_dpi_panels[i].name) == 0) {
+ panel_config = &generic_dpi_panels[i];
+ break;
+ }
+ }
+
+ if (!panel_config)
+ return -EINVAL;
+
+ dssdev->panel.config = panel_config->config;
+ dssdev->panel.timings = panel_config->timings;
+ dssdev->panel.acb = panel_config->acb;
+ dssdev->panel.acbi = panel_config->acbi;
+
+ drv_data = kzalloc(sizeof(*drv_data), GFP_KERNEL);
+ if (!drv_data)
+ return -ENOMEM;
+
+ drv_data->dssdev = dssdev;
+ drv_data->panel_config = panel_config;
+
+ dev_set_drvdata(&dssdev->dev, drv_data);
+
+ return 0;
+}
+
+static void generic_dpi_panel_remove(struct omap_dss_device *dssdev)
+{
+}
+
+static int generic_dpi_panel_enable(struct omap_dss_device *dssdev)
+{
+ int r = 0;
+
+ r = generic_dpi_panel_power_on(dssdev);
+ if (r)
+ return r;
+
+ dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+ return 0;
+}
+
+static void generic_dpi_panel_disable(struct omap_dss_device *dssdev)
+{
+ generic_dpi_panel_power_off(dssdev);
+
+ dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
+}
+
+static int generic_dpi_panel_suspend(struct omap_dss_device *dssdev)
+{
+ generic_dpi_panel_power_off(dssdev);
+
+ dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
+
+ return 0;
+}
+
+static int generic_dpi_panel_resume(struct omap_dss_device *dssdev)
+{
+ int r = 0;
+
+ r = generic_dpi_panel_power_on(dssdev);
+ if (r)
+ return r;
+
+ dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+ return 0;
+}
+
+static void generic_dpi_panel_set_timings(struct omap_dss_device *dssdev,
+ struct omap_video_timings *timings)
+{
+ dpi_set_timings(dssdev, timings);
+}
+
+static void generic_dpi_panel_get_timings(struct omap_dss_device *dssdev,
+ struct omap_video_timings *timings)
+{
+ *timings = dssdev->panel.timings;
+}
+
+static int generic_dpi_panel_check_timings(struct omap_dss_device *dssdev,
+ struct omap_video_timings *timings)
+{
+ return dpi_check_timings(dssdev, timings);
+}
+
+static struct omap_dss_driver dpi_driver = {
+ .probe = generic_dpi_panel_probe,
+ .remove = generic_dpi_panel_remove,
+
+ .enable = generic_dpi_panel_enable,
+ .disable = generic_dpi_panel_disable,
+ .suspend = generic_dpi_panel_suspend,
+ .resume = generic_dpi_panel_resume,
+
+ .set_timings = generic_dpi_panel_set_timings,
+ .get_timings = generic_dpi_panel_get_timings,
+ .check_timings = generic_dpi_panel_check_timings,
+
+ .driver = {
+ .name = "generic_dpi_panel",
+ .owner = THIS_MODULE,
+ },
+};
+
+static int __init generic_dpi_panel_drv_init(void)
+{
+ return omap_dss_register_driver(&dpi_driver);
+}
+
+static void __exit generic_dpi_panel_drv_exit(void)
+{
+ omap_dss_unregister_driver(&dpi_driver);
+}
+
+module_init(generic_dpi_panel_drv_init);
+module_exit(generic_dpi_panel_drv_exit);
+MODULE_LICENSE("GPL");
--
1.7.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 1/3] OMAP: DSS2: Add generic DPI panel display driver
2010-11-17 2:23 ` [PATCH 1/3] OMAP: DSS2: Add generic DPI panel display driver Bryan Wu
@ 2010-11-17 12:44 ` Tomi Valkeinen
2010-11-17 13:38 ` Bryan Wu
0 siblings, 1 reply; 21+ messages in thread
From: Tomi Valkeinen @ 2010-11-17 12:44 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, 2010-11-17 at 10:23 +0800, ext Bryan Wu wrote:
> Generic DPI panel driver includes the driver and 4 similar panel configurations. It
> will match the panel name which is passed from platform data and setup the
> right configurations.
>
> With generic DPI panel driver, we can remove those 4 duplicated panel display
> drivers. In the future, it is simple for us just add new panel configuration
> date in panel-generic-dpi.c to support new display panel.
>
> Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
> ---
> .../arm/plat-omap/include/plat/panel-generic-dpi.h | 37 ++
> drivers/video/omap2/displays/Kconfig | 8 +
> drivers/video/omap2/displays/Makefile | 1 +
> drivers/video/omap2/displays/panel-generic-dpi.c | 348 ++++++++++++++++++++
> 4 files changed, 394 insertions(+), 0 deletions(-)
> create mode 100644 arch/arm/plat-omap/include/plat/panel-generic-dpi.h
> create mode 100644 drivers/video/omap2/displays/panel-generic-dpi.c
>
<snip>
> +static int generic_dpi_panel_probe(struct omap_dss_device *dssdev)
> +{
> + struct panel_generic_dpi_data *panel_data = get_panel_data(dssdev);
> + struct panel_config *panel_config = NULL;
> + struct panel_drv_data *drv_data = NULL;
> + int i;
> +
> + dev_dbg(&dssdev->dev, "probe\n");
> +
> + if (!panel_data || !panel_data->name)
> + return -EINVAL;
> +
> + for (i = 0; i < ARRAY_SIZE(generic_dpi_panels); i++) {
> + if (strcmp(panel_data->name, generic_dpi_panels[i].name) == 0) {
> + panel_config = &generic_dpi_panels[i];
> + break;
> + }
> + }
> +
> + if (!panel_config)
> + return -EINVAL;
> +
> + dssdev->panel.config = panel_config->config;
> + dssdev->panel.timings = panel_config->timings;
> + dssdev->panel.acb = panel_config->acb;
> + dssdev->panel.acbi = panel_config->acbi;
> +
> + drv_data = kzalloc(sizeof(*drv_data), GFP_KERNEL);
> + if (!drv_data)
> + return -ENOMEM;
> +
> + drv_data->dssdev = dssdev;
> + drv_data->panel_config = panel_config;
> +
> + dev_set_drvdata(&dssdev->dev, drv_data);
> +
> + return 0;
> +}
> +
> +static void generic_dpi_panel_remove(struct omap_dss_device *dssdev)
> +{
> +}
You need to free the drv_data here.
Perhaps this will be the last fix =).
Tomi
^ permalink raw reply [flat|nested] 21+ messages in thread* [PATCH 1/3] OMAP: DSS2: Add generic DPI panel display driver
2010-11-17 12:44 ` Tomi Valkeinen
@ 2010-11-17 13:38 ` Bryan Wu
0 siblings, 0 replies; 21+ messages in thread
From: Bryan Wu @ 2010-11-17 13:38 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Nov 17, 2010 at 8:44 PM, Tomi Valkeinen
<tomi.valkeinen@nokia.com> wrote:
> On Wed, 2010-11-17 at 10:23 +0800, ext Bryan Wu wrote:
>> Generic DPI panel driver includes the driver and 4 similar panel configurations. It
>> will match the panel name which is passed from platform data and setup the
>> right configurations.
>>
>> With generic DPI panel driver, we can remove those 4 duplicated panel display
>> drivers. In the future, it is simple for us just add new panel configuration
>> date in panel-generic-dpi.c to support new display panel.
>>
>> Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
>> ---
>> ?.../arm/plat-omap/include/plat/panel-generic-dpi.h | ? 37 ++
>> ?drivers/video/omap2/displays/Kconfig ? ? ? ? ? ? ? | ? ?8 +
>> ?drivers/video/omap2/displays/Makefile ? ? ? ? ? ? ?| ? ?1 +
>> ?drivers/video/omap2/displays/panel-generic-dpi.c ? | ?348 ++++++++++++++++++++
>> ?4 files changed, 394 insertions(+), 0 deletions(-)
>> ?create mode 100644 arch/arm/plat-omap/include/plat/panel-generic-dpi.h
>> ?create mode 100644 drivers/video/omap2/displays/panel-generic-dpi.c
>>
>
[snip]
>> +
>> +static void generic_dpi_panel_remove(struct omap_dss_device *dssdev)
>> +{
>> +}
>
> You need to free the drv_data here.
>
> Perhaps this will be the last fix =).
>
My bad, I just sent out the 8th version for review. Moreover, I think
in panel-taal.c it also misses call dev_set_drvdata(&dssdev->dev,
NULL); after we kfree(td) in taal_remove().
Thanks,
--
Bryan Wu <bryan.wu@canonical.com>
Kernel Developer ? ?+86.138-1617-6545 Mobile
Ubuntu Kernel Team
Canonical Ltd. ? ? ?www.canonical.com
Ubuntu - Linux for human beings | www.ubuntu.com
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH 1/3] OMAP: DSS2: Add generic DPI panel display driver
2010-11-16 4:17 [PATCH 0/3] OMAP: DSS2: introduce generic panel display driver (try #6) Bryan Wu
@ 2010-11-16 4:17 ` Bryan Wu
2010-11-16 15:21 ` Tomi Valkeinen
0 siblings, 1 reply; 21+ messages in thread
From: Bryan Wu @ 2010-11-16 4:17 UTC (permalink / raw)
To: linux-arm-kernel
Generic DPI panel driver includes the driver and 4 similar panel configurations. It
will match the panel name which is passed from platform data and setup the
right configurations.
With generic DPI panel driver, we can remove those 4 duplicated panel display
drivers. In the future, it is simple for us just add new panel configuration
date in panel-generic-dpi.c to support new display panel.
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
---
.../arm/plat-omap/include/plat/panel-generic-dpi.h | 37 +++
drivers/video/omap2/displays/Kconfig | 8 +
drivers/video/omap2/displays/Makefile | 1 +
drivers/video/omap2/displays/panel-generic-dpi.c | 333 ++++++++++++++++++++
4 files changed, 379 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/plat-omap/include/plat/panel-generic-dpi.h
create mode 100644 drivers/video/omap2/displays/panel-generic-dpi.c
diff --git a/arch/arm/plat-omap/include/plat/panel-generic-dpi.h b/arch/arm/plat-omap/include/plat/panel-generic-dpi.h
new file mode 100644
index 0000000..7906197
--- /dev/null
+++ b/arch/arm/plat-omap/include/plat/panel-generic-dpi.h
@@ -0,0 +1,37 @@
+/*
+ * Header for generic DPI panel driver
+ *
+ * Copyright (C) 2010 Canonical Ltd.
+ * Author: Bryan Wu <bryan.wu@canonical.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/>.
+ */
+
+#ifndef __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H
+#define __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H
+
+#include "display.h"
+
+/**
+ * struct panel_generic_dpi_data - panel driver configuration data
+ * @name: panel name
+ * @platform_enable: platform specific panel enable function
+ * @platform_disable: platform specific panel disable function
+ */
+struct panel_generic_dpi_data {
+ const char *name;
+ int (*platform_enable)(struct omap_dss_device *dssdev);
+ void (*platform_disable)(struct omap_dss_device *dssdev);
+};
+
+#endif /* __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H */
diff --git a/drivers/video/omap2/displays/Kconfig b/drivers/video/omap2/displays/Kconfig
index 12327bb..cb3e339 100644
--- a/drivers/video/omap2/displays/Kconfig
+++ b/drivers/video/omap2/displays/Kconfig
@@ -1,6 +1,14 @@
menu "OMAP2/3 Display Device Drivers"
depends on OMAP2_DSS
+config PANEL_GENERIC_DPI
+ tristate "Generic DPI Panel"
+ help
+ Generic DPI panel driver.
+ Supports DVI output for Beagle and OMAP3 SDP.
+ Supports LCD Panel used in TI SDP3430 and EVM boards,
+ OMAP3517 EVM boards and CM-T35.
+
config PANEL_GENERIC
tristate "Generic Panel"
help
diff --git a/drivers/video/omap2/displays/Makefile b/drivers/video/omap2/displays/Makefile
index aa38609..022058c 100644
--- a/drivers/video/omap2/displays/Makefile
+++ b/drivers/video/omap2/displays/Makefile
@@ -1,3 +1,4 @@
+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_LQ043T1DG01) += panel-sharp-lq043t1dg01.o
diff --git a/drivers/video/omap2/displays/panel-generic-dpi.c b/drivers/video/omap2/displays/panel-generic-dpi.c
new file mode 100644
index 0000000..c3fff9e
--- /dev/null
+++ b/drivers/video/omap2/displays/panel-generic-dpi.c
@@ -0,0 +1,333 @@
+/*
+ * Generic DPI Panels support
+ *
+ * Copyright (C) 2010 Canonical Ltd.
+ * Author: Bryan Wu <bryan.wu@canonical.com>
+ *
+ * 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/panel-generic-dpi.h>
+
+struct panel_config {
+ struct omap_video_timings timings;
+
+ int acbi; /* ac-bias pin transitions per interrupt */
+ /* Unit: line clocks */
+ int acb; /* ac-bias pin frequency */
+
+ enum omap_panel_config config;
+
+ int power_on_delay;
+ int power_off_delay;
+
+ /*
+ * Used to match device to panel configuration
+ * when use generic panel driver
+ */
+ const char *name;
+};
+
+/* Panel configurations */
+static struct panel_config generic_dpi_panels[] = {
+ /* Generic Panel */
+ {
+ {
+ .x_res = 640,
+ .y_res = 480,
+
+ .pixel_clock = 23500,
+
+ .hfp = 48,
+ .hsw = 32,
+ .hbp = 80,
+
+ .vfp = 3,
+ .vsw = 4,
+ .vbp = 7,
+ },
+ .acbi = 0x0,
+ .acb = 0x0,
+ .config = OMAP_DSS_LCD_TFT,
+ .power_on_delay = 0,
+ .power_off_delay = 0,
+ .name = "generic",
+ },
+
+ /* Sharp LQ043T1DG01 */
+ {
+ {
+ .x_res = 480,
+ .y_res = 272,
+
+ .pixel_clock = 9000,
+
+ .hsw = 42,
+ .hfp = 3,
+ .hbp = 2,
+
+ .vsw = 11,
+ .vfp = 3,
+ .vbp = 2,
+ },
+ .acbi = 0x0,
+ .acb = 0x0,
+ .config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+ OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IEO,
+ .power_on_delay = 50,
+ .power_off_delay = 100,
+ .name = "sharp_lq",
+ },
+
+ /* Sharp LS037V7DW01 */
+ {
+ {
+ .x_res = 480,
+ .y_res = 640,
+
+ .pixel_clock = 19200,
+
+ .hsw = 2,
+ .hfp = 1,
+ .hbp = 28,
+
+ .vsw = 1,
+ .vfp = 1,
+ .vbp = 1,
+ },
+ .acbi = 0x0,
+ .acb = 0x28,
+ .config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+ OMAP_DSS_LCD_IHS,
+ .power_on_delay = 50,
+ .power_off_delay = 100,
+ .name = "sharp_ls",
+ },
+
+ /* Toppoly TDO35S */
+ {
+ {
+ .x_res = 480,
+ .y_res = 640,
+
+ .pixel_clock = 26000,
+
+ .hfp = 104,
+ .hsw = 8,
+ .hbp = 8,
+
+ .vfp = 4,
+ .vsw = 2,
+ .vbp = 2,
+ },
+ .acbi = 0x0,
+ .acb = 0x0,
+ .config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+ OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IPC |
+ OMAP_DSS_LCD_ONOFF,
+ .power_on_delay = 0,
+ .power_off_delay = 0,
+ .name = "toppoly_tdo35s",
+ },
+};
+
+static power_on_delay = 0;
+
+static power_off_delay = 0;
+
+static inline struct panel_generic_dpi_data
+*get_panel_data(const struct omap_dss_device *dssdev)
+{
+ return (struct panel_generic_dpi_data *) dssdev->data;
+}
+
+static int generic_dpi_panel_power_on(struct omap_dss_device *dssdev)
+{
+ int r;
+ struct panel_generic_dpi_data *panel_data = get_panel_data(dssdev);
+
+ 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 */
+ if (power_on_delay)
+ msleep(power_on_delay);
+
+ if (panel_data->platform_enable) {
+ r = panel_data->platform_enable(dssdev);
+ if (r)
+ goto err1;
+ }
+
+ return 0;
+err1:
+ omapdss_dpi_display_disable(dssdev);
+err0:
+ return r;
+}
+
+static void generic_dpi_panel_power_off(struct omap_dss_device *dssdev)
+{
+ struct panel_generic_dpi_data *panel_data = get_panel_data(dssdev);
+
+ if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
+ return;
+
+ if (panel_data->platform_disable)
+ panel_data->platform_disable(dssdev);
+
+ /* wait couple of vsyncs after disabling the LCD */
+ if (power_off_delay)
+ msleep(power_off_delay);
+
+ omapdss_dpi_display_disable(dssdev);
+}
+
+static int generic_dpi_panel_probe(struct omap_dss_device *dssdev)
+{
+ struct panel_generic_dpi_data *panel_data = get_panel_data(dssdev);
+ struct panel_config *panel_config = NULL;
+ int i;
+
+ dev_dbg(&dssdev->dev, "probe\n");
+
+ if (!panel_data || !panel_data->name)
+ return -EINVAL;
+
+ for (i = 0; i < ARRAY_SIZE(generic_dpi_panels); i++) {
+ if (strcmp(panel_data->name, generic_dpi_panels[i].name) == 0) {
+ panel_config = &generic_dpi_panels[i];
+ break;
+ }
+ }
+
+ if (!panel_config)
+ return -EINVAL;
+
+ dssdev->panel.config = panel_config->config;
+ dssdev->panel.timings = panel_config->timings;
+ dssdev->panel.acb = panel_config->acb;
+ dssdev->panel.acbi = panel_config->acbi;
+
+ power_on_delay = panel_config->power_on_delay;
+ power_off_delay = panel_config->power_off_delay;
+
+ return 0;
+}
+
+static void generic_dpi_panel_remove(struct omap_dss_device *dssdev)
+{
+}
+
+static int generic_dpi_panel_enable(struct omap_dss_device *dssdev)
+{
+ int r = 0;
+
+ r = generic_dpi_panel_power_on(dssdev);
+ if (r)
+ return r;
+
+ dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+ return 0;
+}
+
+static void generic_dpi_panel_disable(struct omap_dss_device *dssdev)
+{
+ generic_dpi_panel_power_off(dssdev);
+
+ dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
+}
+
+static int generic_dpi_panel_suspend(struct omap_dss_device *dssdev)
+{
+ generic_dpi_panel_power_off(dssdev);
+
+ dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
+
+ return 0;
+}
+
+static int generic_dpi_panel_resume(struct omap_dss_device *dssdev)
+{
+ int r = 0;
+
+ r = generic_dpi_panel_power_on(dssdev);
+ if (r)
+ return r;
+
+ dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+ return 0;
+}
+
+static void generic_dpi_panel_set_timings(struct omap_dss_device *dssdev,
+ struct omap_video_timings *timings)
+{
+ dpi_set_timings(dssdev, timings);
+}
+
+static void generic_dpi_panel_get_timings(struct omap_dss_device *dssdev,
+ struct omap_video_timings *timings)
+{
+ *timings = dssdev->panel.timings;
+}
+
+static int generic_dpi_panel_check_timings(struct omap_dss_device *dssdev,
+ struct omap_video_timings *timings)
+{
+ return dpi_check_timings(dssdev, timings);
+}
+
+static struct omap_dss_driver dpi_driver = {
+ .probe = generic_dpi_panel_probe,
+ .remove = generic_dpi_panel_remove,
+
+ .enable = generic_dpi_panel_enable,
+ .disable = generic_dpi_panel_disable,
+ .suspend = generic_dpi_panel_suspend,
+ .resume = generic_dpi_panel_resume,
+
+ .set_timings = generic_dpi_panel_set_timings,
+ .get_timings = generic_dpi_panel_get_timings,
+ .check_timings = generic_dpi_panel_check_timings,
+
+ .driver = {
+ .name = "generic_dpi_panel",
+ .owner = THIS_MODULE,
+ },
+};
+
+static int __init generic_dpi_panel_drv_init(void)
+{
+ return omap_dss_register_driver(&dpi_driver);
+}
+
+static void __exit generic_dpi_panel_drv_exit(void)
+{
+ omap_dss_unregister_driver(&dpi_driver);
+}
+
+module_init(generic_dpi_panel_drv_init);
+module_exit(generic_dpi_panel_drv_exit);
+MODULE_LICENSE("GPL");
--
1.7.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 1/3] OMAP: DSS2: Add generic DPI panel display driver
2010-11-16 4:17 ` [PATCH 1/3] OMAP: DSS2: Add generic DPI panel display driver Bryan Wu
@ 2010-11-16 15:21 ` Tomi Valkeinen
2010-11-17 6:31 ` Bryan Wu
0 siblings, 1 reply; 21+ messages in thread
From: Tomi Valkeinen @ 2010-11-16 15:21 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Tue, 2010-11-16 at 05:17 +0100, ext Bryan Wu wrote:
> Generic DPI panel driver includes the driver and 4 similar panel configurations. It
> will match the panel name which is passed from platform data and setup the
> right configurations.
>
> With generic DPI panel driver, we can remove those 4 duplicated panel display
> drivers. In the future, it is simple for us just add new panel configuration
> date in panel-generic-dpi.c to support new display panel.
>
> Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
> ---
> .../arm/plat-omap/include/plat/panel-generic-dpi.h | 37 +++
> drivers/video/omap2/displays/Kconfig | 8 +
> drivers/video/omap2/displays/Makefile | 1 +
> drivers/video/omap2/displays/panel-generic-dpi.c | 333 ++++++++++++++++++++
> 4 files changed, 379 insertions(+), 0 deletions(-)
> create mode 100644 arch/arm/plat-omap/include/plat/panel-generic-dpi.h
> create mode 100644 drivers/video/omap2/displays/panel-generic-dpi.c
>
> diff --git a/arch/arm/plat-omap/include/plat/panel-generic-dpi.h b/arch/arm/plat-omap/include/plat/panel-generic-dpi.h
> new file mode 100644
> index 0000000..7906197
> --- /dev/null
> +++ b/arch/arm/plat-omap/include/plat/panel-generic-dpi.h
> @@ -0,0 +1,37 @@
> +/*
> + * Header for generic DPI panel driver
> + *
> + * Copyright (C) 2010 Canonical Ltd.
> + * Author: Bryan Wu <bryan.wu@canonical.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/>.
> + */
> +
> +#ifndef __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H
> +#define __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H
> +
> +#include "display.h"
> +
> +/**
> + * struct panel_generic_dpi_data - panel driver configuration data
> + * @name: panel name
> + * @platform_enable: platform specific panel enable function
> + * @platform_disable: platform specific panel disable function
> + */
> +struct panel_generic_dpi_data {
> + const char *name;
> + int (*platform_enable)(struct omap_dss_device *dssdev);
> + void (*platform_disable)(struct omap_dss_device *dssdev);
> +};
> +
> +#endif /* __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H */
> diff --git a/drivers/video/omap2/displays/Kconfig b/drivers/video/omap2/displays/Kconfig
> index 12327bb..cb3e339 100644
> --- a/drivers/video/omap2/displays/Kconfig
> +++ b/drivers/video/omap2/displays/Kconfig
> @@ -1,6 +1,14 @@
> menu "OMAP2/3 Display Device Drivers"
> depends on OMAP2_DSS
>
> +config PANEL_GENERIC_DPI
> + tristate "Generic DPI Panel"
> + help
> + Generic DPI panel driver.
> + Supports DVI output for Beagle and OMAP3 SDP.
> + Supports LCD Panel used in TI SDP3430 and EVM boards,
> + OMAP3517 EVM boards and CM-T35.
> +
> config PANEL_GENERIC
> tristate "Generic Panel"
> help
> diff --git a/drivers/video/omap2/displays/Makefile b/drivers/video/omap2/displays/Makefile
> index aa38609..022058c 100644
> --- a/drivers/video/omap2/displays/Makefile
> +++ b/drivers/video/omap2/displays/Makefile
> @@ -1,3 +1,4 @@
> +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_LQ043T1DG01) += panel-sharp-lq043t1dg01.o
> diff --git a/drivers/video/omap2/displays/panel-generic-dpi.c b/drivers/video/omap2/displays/panel-generic-dpi.c
> new file mode 100644
> index 0000000..c3fff9e
> --- /dev/null
> +++ b/drivers/video/omap2/displays/panel-generic-dpi.c
> @@ -0,0 +1,333 @@
> +/*
> + * Generic DPI Panels support
> + *
> + * Copyright (C) 2010 Canonical Ltd.
> + * Author: Bryan Wu <bryan.wu@canonical.com>
> + *
> + * 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/panel-generic-dpi.h>
> +
> +struct panel_config {
> + struct omap_video_timings timings;
> +
> + int acbi; /* ac-bias pin transitions per interrupt */
> + /* Unit: line clocks */
> + int acb; /* ac-bias pin frequency */
> +
> + enum omap_panel_config config;
> +
> + int power_on_delay;
> + int power_off_delay;
> +
> + /*
> + * Used to match device to panel configuration
> + * when use generic panel driver
> + */
> + const char *name;
> +};
> +
> +/* Panel configurations */
> +static struct panel_config generic_dpi_panels[] = {
> + /* Generic Panel */
> + {
> + {
> + .x_res = 640,
> + .y_res = 480,
> +
> + .pixel_clock = 23500,
> +
> + .hfp = 48,
> + .hsw = 32,
> + .hbp = 80,
> +
> + .vfp = 3,
> + .vsw = 4,
> + .vbp = 7,
> + },
> + .acbi = 0x0,
> + .acb = 0x0,
> + .config = OMAP_DSS_LCD_TFT,
> + .power_on_delay = 0,
> + .power_off_delay = 0,
> + .name = "generic",
> + },
> +
> + /* Sharp LQ043T1DG01 */
> + {
> + {
> + .x_res = 480,
> + .y_res = 272,
> +
> + .pixel_clock = 9000,
> +
> + .hsw = 42,
> + .hfp = 3,
> + .hbp = 2,
> +
> + .vsw = 11,
> + .vfp = 3,
> + .vbp = 2,
> + },
> + .acbi = 0x0,
> + .acb = 0x0,
> + .config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
> + OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IEO,
> + .power_on_delay = 50,
> + .power_off_delay = 100,
> + .name = "sharp_lq",
> + },
> +
> + /* Sharp LS037V7DW01 */
> + {
> + {
> + .x_res = 480,
> + .y_res = 640,
> +
> + .pixel_clock = 19200,
> +
> + .hsw = 2,
> + .hfp = 1,
> + .hbp = 28,
> +
> + .vsw = 1,
> + .vfp = 1,
> + .vbp = 1,
> + },
> + .acbi = 0x0,
> + .acb = 0x28,
> + .config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
> + OMAP_DSS_LCD_IHS,
> + .power_on_delay = 50,
> + .power_off_delay = 100,
> + .name = "sharp_ls",
> + },
> +
> + /* Toppoly TDO35S */
> + {
> + {
> + .x_res = 480,
> + .y_res = 640,
> +
> + .pixel_clock = 26000,
> +
> + .hfp = 104,
> + .hsw = 8,
> + .hbp = 8,
> +
> + .vfp = 4,
> + .vsw = 2,
> + .vbp = 2,
> + },
> + .acbi = 0x0,
> + .acb = 0x0,
> + .config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
> + OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IPC |
> + OMAP_DSS_LCD_ONOFF,
> + .power_on_delay = 0,
> + .power_off_delay = 0,
> + .name = "toppoly_tdo35s",
> + },
> +};
> +
> +static power_on_delay = 0;
> +
> +static power_off_delay = 0;
This is not right. There may be multiple panels in a single board, and
these would be shared by both of the panels.
What you need to do is have a struct, which contains pointer to the
panel configuration used with that particular dssdev, and set the struct
with dev_set_drvdata().
Check panel-taal.c for an example. There's struct taal_data, which
contains also quite a bit other data, but also a pointer to the panel
config.
Tomi
^ permalink raw reply [flat|nested] 21+ messages in thread* [PATCH 1/3] OMAP: DSS2: Add generic DPI panel display driver
2010-11-16 15:21 ` Tomi Valkeinen
@ 2010-11-17 6:31 ` Bryan Wu
0 siblings, 0 replies; 21+ messages in thread
From: Bryan Wu @ 2010-11-17 6:31 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 16, 2010 at 11:21 PM, Tomi Valkeinen
<tomi.valkeinen@nokia.com> wrote:
> Hi,
>
> On Tue, 2010-11-16 at 05:17 +0100, ext Bryan Wu wrote:
>> Generic DPI panel driver includes the driver and 4 similar panel configurations. It
>> will match the panel name which is passed from platform data and setup the
>> right configurations.
>>
>> With generic DPI panel driver, we can remove those 4 duplicated panel display
>> drivers. In the future, it is simple for us just add new panel configuration
>> date in panel-generic-dpi.c to support new display panel.
>>
>> Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
>> ---
>> ?.../arm/plat-omap/include/plat/panel-generic-dpi.h | ? 37 +++
[snip]
>> +
>> +static power_on_delay = 0;
>> +
>> +static power_off_delay = 0;
>
> This is not right. There may be multiple panels in a single board, and
> these would be shared by both of the panels.
>
> What you need to do is have a struct, which contains pointer to the
> panel configuration used with that particular dssdev, and set the struct
> with dev_set_drvdata().
>
> Check panel-taal.c for an example. There's struct taal_data, which
> contains also quite a bit other data, but also a pointer to the panel
> config.
>
Exactly, I just fixed it and sent the updated patchset.
Thanks,
--
Bryan Wu <bryan.wu@canonical.com>
Kernel Developer ? ?+86.138-1617-6545 Mobile
Ubuntu Kernel Team
Canonical Ltd. ? ? ?www.canonical.com
Ubuntu - Linux for human beings | www.ubuntu.com
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH 1/3] OMAP: DSS2: Add generic DPI panel display driver
2010-11-08 21:44 [PATCH 0/3] OMAP: DSS2: introduce generic panel display driver (try #4) Bryan Wu
@ 2010-11-08 21:44 ` Bryan Wu
2010-11-09 10:23 ` Tomi Valkeinen
0 siblings, 1 reply; 21+ messages in thread
From: Bryan Wu @ 2010-11-08 21:44 UTC (permalink / raw)
To: linux-arm-kernel
Generic DPI panel driver includes the driver and 4 similar panel configurations. It
will match the panel name which is passed from platform data and setup the
right configurations.
With generic DPI panel driver, we can remove those 4 duplicated panel display
drivers. In the future, it is simple for us just add new panel configuration
date in panel-generic-dpi.c to support new display panel.
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
---
.../arm/plat-omap/include/plat/panel-generic-dpi.h | 31 ++
drivers/video/omap2/displays/Kconfig | 8 +
drivers/video/omap2/displays/Makefile | 1 +
drivers/video/omap2/displays/panel-generic-dpi.c | 314 ++++++++++++++++++++
4 files changed, 354 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/plat-omap/include/plat/panel-generic-dpi.h
create mode 100644 drivers/video/omap2/displays/panel-generic-dpi.c
diff --git a/arch/arm/plat-omap/include/plat/panel-generic-dpi.h b/arch/arm/plat-omap/include/plat/panel-generic-dpi.h
new file mode 100644
index 0000000..da50756
--- /dev/null
+++ b/arch/arm/plat-omap/include/plat/panel-generic-dpi.h
@@ -0,0 +1,31 @@
+/*
+ * Header for generic DPI panel driver
+ *
+ * Copyright (C) 2010 Canonical Ltd.
+ * Author: Bryan Wu <bryan.wu@canonical.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/>.
+ */
+
+#ifndef __ARCH_ARM_PLAT_OMAP_GENERIC_DPI_PANEL_H
+#define __ARCH_ARM_PLAT_OMAP_GENERIC_DPI_PANEL_H
+
+/**
+ * struct panel_data - panel driver configuration
+ * @name: panel name
+ */
+struct generic_dpi_panel_data {
+ const char *name;
+};
+
+#endif /* __ARCH_ARM_PLAT_OMAP_GENERIC_DPI_PANEL_H */
diff --git a/drivers/video/omap2/displays/Kconfig b/drivers/video/omap2/displays/Kconfig
index 12327bb..cb3e339 100644
--- a/drivers/video/omap2/displays/Kconfig
+++ b/drivers/video/omap2/displays/Kconfig
@@ -1,6 +1,14 @@
menu "OMAP2/3 Display Device Drivers"
depends on OMAP2_DSS
+config PANEL_GENERIC_DPI
+ tristate "Generic DPI Panel"
+ help
+ Generic DPI panel driver.
+ Supports DVI output for Beagle and OMAP3 SDP.
+ Supports LCD Panel used in TI SDP3430 and EVM boards,
+ OMAP3517 EVM boards and CM-T35.
+
config PANEL_GENERIC
tristate "Generic Panel"
help
diff --git a/drivers/video/omap2/displays/Makefile b/drivers/video/omap2/displays/Makefile
index aa38609..022058c 100644
--- a/drivers/video/omap2/displays/Makefile
+++ b/drivers/video/omap2/displays/Makefile
@@ -1,3 +1,4 @@
+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_LQ043T1DG01) += panel-sharp-lq043t1dg01.o
diff --git a/drivers/video/omap2/displays/panel-generic-dpi.c b/drivers/video/omap2/displays/panel-generic-dpi.c
new file mode 100644
index 0000000..b252e0f
--- /dev/null
+++ b/drivers/video/omap2/displays/panel-generic-dpi.c
@@ -0,0 +1,314 @@
+/*
+ * Generic DPI Panels support
+ *
+ * Copyright (C) 2010 Canonical Ltd.
+ * Author: Bryan Wu <bryan.wu@canonical.com>
+ *
+ * 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>
+#include <plat/panel-generic-dpi.h>
+
+struct panel_config {
+ struct omap_video_timings timings;
+
+ int acbi; /* ac-bias pin transitions per interrupt */
+ /* Unit: line clocks */
+ int acb; /* ac-bias pin frequency */
+
+ enum omap_panel_config config;
+
+ /*
+ * Used to match device to panel configuration
+ * when use generic panel driver
+ */
+ const char *name;
+
+ int data_lines;
+};
+
+/* Panel configurations */
+static struct panel_config generic_dpi_panels[] = {
+ /* Generic Panel */
+ {
+ {
+ .x_res = 640,
+ .y_res = 480,
+
+ .pixel_clock = 23500,
+
+ .hfp = 48,
+ .hsw = 32,
+ .hbp = 80,
+
+ .vfp = 3,
+ .vsw = 4,
+ .vbp = 7,
+ },
+ .acbi = 0x0,
+ .acb = 0x0,
+ .config = OMAP_DSS_LCD_TFT,
+ .name = "generic",
+ .data_lines = 24,
+ },
+
+ /* Sharp LQ043T1DG01 */
+ {
+ {
+ .x_res = 480,
+ .y_res = 272,
+
+ .pixel_clock = 9000,
+
+ .hsw = 42,
+ .hfp = 3,
+ .hbp = 2,
+
+ .vsw = 11,
+ .vfp = 3,
+ .vbp = 2,
+ },
+ .acbi = 0x0,
+ .acb = 0x0,
+ .config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+ OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IEO,
+ .name = "sharp_lq",
+ .data_lines = 16,
+ },
+
+ /* Sharp LS037V7DW01 */
+ {
+ {
+ .x_res = 480,
+ .y_res = 640,
+
+ .pixel_clock = 19200,
+
+ .hsw = 2,
+ .hfp = 1,
+ .hbp = 28,
+
+ .vsw = 1,
+ .vfp = 1,
+ .vbp = 1,
+ },
+ .acbi = 0x0,
+ .acb = 0x28,
+ .config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+ OMAP_DSS_LCD_IHS,
+ .name = "sharp_ls",
+ .data_lines = 16,
+ },
+
+ /* Toppoly TDO35S */
+ {
+ {
+ .x_res = 480,
+ .y_res = 640,
+
+ .pixel_clock = 26000,
+
+ .hfp = 104,
+ .hsw = 8,
+ .hbp = 8,
+
+ .vfp = 4,
+ .vsw = 2,
+ .vbp = 2,
+ },
+ .acbi = 0x0,
+ .acb = 0x0,
+ .config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+ OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IPC |
+ OMAP_DSS_LCD_ONOFF,
+ .name = "toppoly_tdo35s",
+ .data_lines = 18,
+ },
+};
+
+static inline struct generic_dpi_panel_data
+*get_panel_data(const struct omap_dss_device *dssdev)
+{
+ return (struct generic_dpi_panel_data *) dssdev->data;
+}
+
+
+static int generic_dpi_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_dpi_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_dpi_panel_probe(struct omap_dss_device *dssdev)
+{
+ struct generic_dpi_panel_data *panel_data = get_panel_data(dssdev);
+ struct panel_config *panel_config = NULL;
+ int i;
+
+ dev_dbg(&dssdev->dev, "probe\n");
+
+ if (!panel_data || !panel_data->name)
+ return -EINVAL;
+
+ for (i = 0; i < ARRAY_SIZE(generic_dpi_panels); i++) {
+ if (strcmp(panel_data->name, generic_dpi_panels[i].name) == 0) {
+ panel_config = &generic_dpi_panels[i];
+ break;
+ }
+ }
+
+ if (!panel_config)
+ return -EINVAL;
+
+ dssdev->type = OMAP_DISPLAY_TYPE_DPI;
+ dssdev->panel.config = panel_config->config;
+ dssdev->panel.timings = panel_config->timings;
+ dssdev->panel.acb = panel_config->acb;
+ dssdev->panel.acbi = panel_config->acbi;
+ dssdev->phy.dpi.data_lines = panel_config->data_lines;
+
+ return 0;
+}
+
+static void generic_dpi_panel_remove(struct omap_dss_device *dssdev)
+{
+}
+
+static int generic_dpi_panel_enable(struct omap_dss_device *dssdev)
+{
+ int r = 0;
+
+ r = generic_dpi_panel_power_on(dssdev);
+ if (r)
+ return r;
+
+ dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+ return 0;
+}
+
+static void generic_dpi_panel_disable(struct omap_dss_device *dssdev)
+{
+ generic_dpi_panel_power_off(dssdev);
+
+ dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
+}
+
+static int generic_dpi_panel_suspend(struct omap_dss_device *dssdev)
+{
+ generic_dpi_panel_power_off(dssdev);
+
+ dssdev->state = OMAP_DSS_DISPLAY_SUSPENDED;
+
+ return 0;
+}
+
+static int generic_dpi_panel_resume(struct omap_dss_device *dssdev)
+{
+ int r = 0;
+
+ r = generic_dpi_panel_power_on(dssdev);
+ if (r)
+ return r;
+
+ dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+ return 0;
+}
+
+static void generic_dpi_panel_set_timings(struct omap_dss_device *dssdev,
+ struct omap_video_timings *timings)
+{
+ dpi_set_timings(dssdev, timings);
+}
+
+static void generic_dpi_panel_get_timings(struct omap_dss_device *dssdev,
+ struct omap_video_timings *timings)
+{
+ *timings = dssdev->panel.timings;
+}
+
+static int generic_dpi_panel_check_timings(struct omap_dss_device *dssdev,
+ struct omap_video_timings *timings)
+{
+ return dpi_check_timings(dssdev, timings);
+}
+
+static struct omap_dss_driver dpi_driver = {
+ .probe = generic_dpi_panel_probe,
+ .remove = generic_dpi_panel_remove,
+
+ .enable = generic_dpi_panel_enable,
+ .disable = generic_dpi_panel_disable,
+ .suspend = generic_dpi_panel_suspend,
+ .resume = generic_dpi_panel_resume,
+
+ .set_timings = generic_dpi_panel_set_timings,
+ .get_timings = generic_dpi_panel_get_timings,
+ .check_timings = generic_dpi_panel_check_timings,
+
+ .driver = {
+ .name = "generic_dpi_panel",
+ .owner = THIS_MODULE,
+ },
+};
+
+static int __init generic_dpi_panel_drv_init(void)
+{
+ return omap_dss_register_driver(&dpi_driver);
+}
+
+static void __exit generic_dpi_panel_drv_exit(void)
+{
+ omap_dss_unregister_driver(&dpi_driver);
+}
+
+module_init(generic_dpi_panel_drv_init);
+module_exit(generic_dpi_panel_drv_exit);
+MODULE_LICENSE("GPL");
--
1.7.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH 1/3] OMAP: DSS2: Add generic DPI panel display driver
2010-11-08 21:44 ` [PATCH 1/3] OMAP: DSS2: Add generic DPI panel display driver Bryan Wu
@ 2010-11-09 10:23 ` Tomi Valkeinen
0 siblings, 0 replies; 21+ messages in thread
From: Tomi Valkeinen @ 2010-11-09 10:23 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Mon, 2010-11-08 at 22:44 +0100, ext Bryan Wu wrote:
> Generic DPI panel driver includes the driver and 4 similar panel configurations. It
> will match the panel name which is passed from platform data and setup the
> right configurations.
>
> With generic DPI panel driver, we can remove those 4 duplicated panel display
> drivers. In the future, it is simple for us just add new panel configuration
> date in panel-generic-dpi.c to support new display panel.
>
> Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
> ---
> .../arm/plat-omap/include/plat/panel-generic-dpi.h | 31 ++
> drivers/video/omap2/displays/Kconfig | 8 +
> drivers/video/omap2/displays/Makefile | 1 +
> drivers/video/omap2/displays/panel-generic-dpi.c | 314 ++++++++++++++++++++
> 4 files changed, 354 insertions(+), 0 deletions(-)
> create mode 100644 arch/arm/plat-omap/include/plat/panel-generic-dpi.h
> create mode 100644 drivers/video/omap2/displays/panel-generic-dpi.c
>
> diff --git a/arch/arm/plat-omap/include/plat/panel-generic-dpi.h b/arch/arm/plat-omap/include/plat/panel-generic-dpi.h
> new file mode 100644
> index 0000000..da50756
> --- /dev/null
> +++ b/arch/arm/plat-omap/include/plat/panel-generic-dpi.h
> @@ -0,0 +1,31 @@
> +/*
> + * Header for generic DPI panel driver
> + *
> + * Copyright (C) 2010 Canonical Ltd.
> + * Author: Bryan Wu <bryan.wu@canonical.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/>.
> + */
> +
> +#ifndef __ARCH_ARM_PLAT_OMAP_GENERIC_DPI_PANEL_H
> +#define __ARCH_ARM_PLAT_OMAP_GENERIC_DPI_PANEL_H
Should be __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H
> +
> +/**
> + * struct panel_data - panel driver configuration
> + * @name: panel name
> + */
> +struct generic_dpi_panel_data {
I think the struct name should be panel_generic_dpi_data.
> + const char *name;
> +};
Please add here also the fields platform_enable/disable and use them
instead of the ones in dssdev.
Tomi
^ permalink raw reply [flat|nested] 21+ messages in thread