OMAP: DSS2: introduce generic panel display driver (try #4)
Subsystems (4)
cover OMAP: DSS2: introduce generic panel display driver (try #4)
There are 4 duplicated DPI panel drivers in DSS2 display driver. They are similar and a generic DPI panel driver can support all them with specific panel configuration. And new DPI panel driver can be easily supported by adding panel configurations into generic panel DPI driver.
This patchset introduces a generic panel DPI driver, remove 3 panel drivers and enable generic panel DPI driver in board files. And it is based on 2.6.37-rc1.
Building with omap2plus_defconfig is successful.
Keep sharp_ls_panel, since it contains blacklight control code which will be moved out later.
Bryan Wu (3):
OMAP: DSS2: Add generic DPI panel display driver
OMAP: use generic DPI panel driver in board files
OMAP: DSS2: remove generic DPI panel driver duplicated panel drivers
arch/arm/mach-omap2/board-3430sdp.c | 10 +- arch/arm/mach-omap2/board-am3517evm.c | 19 +- arch/arm/mach-omap2/board-cm-t35.c | 19 +- arch/arm/mach-omap2/board-devkit8000.c | 22 +- arch/arm/mach-omap2/board-igep0020.c | 10 +- arch/arm/mach-omap2/board-omap3beagle.c | 10 +- arch/arm/mach-omap2/board-omap3evm.c | 10 +- arch/arm/mach-omap2/board-omap3stalker.c | 19 +- .../arm/plat-omap/include/plat/panel-generic-dpi.h | 31 ++ drivers/video/omap2/displays/Kconfig | 22 +- drivers/video/omap2/displays/Makefile | 4 +- drivers/video/omap2/displays/panel-generic-dpi.c | 314 ++++++++++++++++++++ drivers/video/omap2/displays/panel-generic.c | 174 ----------- .../video/omap2/displays/panel-sharp-lq043t1dg01.c | 165 ---------- .../video/omap2/displays/panel-toppoly-tdo35s.c | 164 ---------- 15 files changed, 433 insertions(+), 560 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 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
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.
--- .../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
arch/arm/plat-omap/include/plat/panel-generic-dpi.h new file +31 -0
@@ -0,0 +1,31 @@ +/* +* Header for generic DPI panel driver +* +* Copyright (C) 2010 Canonical Ltd. +* Author: Bryan Wu <[email protected]> +* +* 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 */
drivers/video/omap2/displays/Kconfig +8 -0
@@ -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
drivers/video/omap2/displays/Makefile +1 -0
@@ -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
drivers/video/omap2/displays/panel-generic-dpi.c new file +314 -0
314 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH 1/3 OMAP: DSS2: Add generic DPI panel display driver
Hi,
Quoted 35 lines · ext Bryan Wu
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.cto support new display panel.Signed-off-by Bryan Wu <[email protected]>--- .../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.carch/arm/plat-omap/include/plat/panel-generic-dpi.h new file +11
-0@@ -0,0 +1,31 @@ +/* +* Header for generic DPI panel driver +* +* Copyright (C) 2010 Canonical Ltd. +* Author: Bryan Wu <[email protected]> +* +* 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
arch/arm/plat-omap/include/plat/panel-generic-dpi.h line 21
Quoted 10 lines
arch/arm/plat-omap/include/plat/panel-generic-dpi.h new file +10
-0+* 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
arch/arm/plat-omap/include/plat/panel-generic-dpi.h line 27
Quoted 6 lines
arch/arm/plat-omap/include/plat/panel-generic-dpi.h new file +6
-0+ +/** +* 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.
arch/arm/plat-omap/include/plat/panel-generic-dpi.h line 29
Quoted 2 lines
arch/arm/plat-omap/include/plat/panel-generic-dpi.h new file +2
-0+const char *name; +};
Please add here also the fields platform_enable/disable and use them instead of the ones in dssdev.
Tomi
PATCH 2/3 OMAP: use generic DPI panel driver in board files
In reply to Bryan WuStill 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.
--- arch/arm/mach-omap2/board-3430sdp.c | 10 +++++++--- arch/arm/mach-omap2/board-am3517evm.c | 19 +++++++++++++------ arch/arm/mach-omap2/board-cm-t35.c | 19 +++++++++++++------ arch/arm/mach-omap2/board-devkit8000.c | 22 ++++++++++++++-------- arch/arm/mach-omap2/board-igep0020.c | 10 +++++++--- arch/arm/mach-omap2/board-omap3beagle.c | 10 +++++++--- arch/arm/mach-omap2/board-omap3evm.c | 10 +++++++--- arch/arm/mach-omap2/board-omap3stalker.c | 19 +++++++++++++------ 8 files changed, 81 insertions(+), 38 deletions(-)
arch/arm/mach-omap2/board-3430sdp.c +7 -3
@@ -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,11 +271,14 @@ static struct omap_dss_device sdp3430_lcd_device = { .platform_disable = sdp3430_panel_disable_lcd, }; +static struct generic_dpi_panel_data dvi_panel = { + .name ="generic" , +}; +static struct omap_dss_device sdp3430_dvi_device = { .name ="dvi" , - .driver_name ="generic_panel" , - .type =OMAP_DISPLAY_TYPE_DPI , - .phy.dpi.data_lines =24 , + .driver_name ="generic_dpi_panel" , + .data = &dvi_panel, .platform_enable = sdp3430_panel_enable_dvi, .platform_disable = sdp3430_panel_disable_dvi, };
arch/arm/mach-omap2/board-am3517evm.c +13 -6
@@ -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,11 +304,14 @@ static void am3517_evm_panel_disable_lcd(struct omap_dss_device *dssdev) lcd_enabled =0 ; } +static struct generic_dpi_panel_data lcd_panel = { + .name ="sharp_lq" , +}; +static struct omap_dss_device am3517_evm_lcd_device = { - .type =OMAP_DISPLAY_TYPE_DPI , .name ="lcd" , - .driver_name ="sharp_lq_panel" , - .phy.dpi.data_lines =16 , + .driver_name ="generic_dpi_panel" , + .data = &lcd_panel, .platform_enable = am3517_evm_panel_enable_lcd, .platform_disable = am3517_evm_panel_disable_lcd, };
@@ -346,11 +350,14 @@ static void am3517_evm_panel_disable_dvi(struct omap_dss_device *dssdev) dvi_enabled =0 ; } +static struct generic_dpi_panel_data dvi_panel = { + .name ="generic" , +}; +static struct omap_dss_device am3517_evm_dvi_device = { - .type =OMAP_DISPLAY_TYPE_DPI , .name ="dvi" , - .driver_name ="generic_panel" , - .phy.dpi.data_lines =24 , + .driver_name ="generic_dpi_panel" , + .data = &dvi_panel, .platform_enable = am3517_evm_panel_enable_dvi, .platform_disable = am3517_evm_panel_disable_dvi, };
arch/arm/mach-omap2/board-cm-t35.c +13 -6
@@ -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,20 +352,26 @@ static void cm_t35_panel_disable_tv(struct omap_dss_device *dssdev) { } +static struct generic_dpi_panel_data lcd_panel = { + .name ="toppoly_tdo35s" , +}; +static struct omap_dss_device cm_t35_lcd_device = { .name ="lcd" , - .driver_name ="toppoly_tdo35s_panel" , - .type =OMAP_DISPLAY_TYPE_DPI , - .phy.dpi.data_lines =18 , + .driver_name ="generic_dpi_panel" , + .data = &lcd_panel, .platform_enable = cm_t35_panel_enable_lcd, .platform_disable = cm_t35_panel_disable_lcd, }; +static struct generic_dpi_panel_data dvi_panel = { + .name ="generic" , +}; +static struct omap_dss_device cm_t35_dvi_device = { .name ="dvi" , - .driver_name ="generic_panel" , - .type =OMAP_DISPLAY_TYPE_DPI , - .phy.dpi.data_lines =24 , + .driver_name ="generic_dpi_panel" , + .data = &dvi_panel, .platform_enable = cm_t35_panel_enable_dvi, .platform_disable = cm_t35_panel_disable_dvi, };
arch/arm/mach-omap2/board-devkit8000.c +14 -8
@@ -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,21 +150,26 @@ static struct regulator_consumer_supply devkit8000_vmmc1_supply =static struct regulator_consumer_supply devkit8000_vio_supply =REGULATOR_SUPPLY ("vcc" ,"spi2.0" ); +static struct generic_dpi_panel_data lcd_panel = { + .name ="generic" , +}; +static struct omap_dss_device devkit8000_lcd_device = { .name ="lcd" , - .driver_name ="generic_panel" , - .type =OMAP_DISPLAY_TYPE_DPI , - .phy.dpi.data_lines =24 , - .reset_gpio = -EINVAL ,/* will be replaced */ + .driver_name ="generic_dpi_panel" , + .data = &lcd_panel, .platform_enable = devkit8000_panel_enable_lcd, .platform_disable = devkit8000_panel_disable_lcd, }; + +static struct generic_dpi_panel_data dvi_panel = { + .name ="generic" , +}; +static struct omap_dss_device devkit8000_dvi_device = { .name ="dvi" , - .driver_name ="generic_panel" , - .type =OMAP_DISPLAY_TYPE_DPI , - .phy.dpi.data_lines =24 , - .reset_gpio = -EINVAL ,/* will be replaced */ + .driver_name ="generic_dpi_panel" , + .data = &dvi_panel, .platform_enable = devkit8000_panel_enable_dvi, .platform_disable = devkit8000_panel_disable_dvi, };
arch/arm/mach-omap2/board-igep0020.c +7 -3
@@ -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,11 +434,14 @@ static void igep2_disable_dvi(struct omap_dss_device *dssdev)gpio_direction_output (IGEP2_GPIO_DVI_PUP ,0 ); } +static struct generic_dpi_panel_data dvi_panel = { + .name ="generic" , +}; +static struct omap_dss_device igep2_dvi_device = { - .type =OMAP_DISPLAY_TYPE_DPI , .name ="dvi" , - .driver_name ="generic_panel" , - .phy.dpi.data_lines =24 , + .driver_name ="generic_dpi_panel" , + .data = &dvi_panel, .platform_enable = igep2_enable_dvi, .platform_disable = igep2_disable_dvi, };
arch/arm/mach-omap2/board-omap3beagle.c +7 -3
@@ -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,11 +195,14 @@ static void beagle_disable_dvi(struct omap_dss_device *dssdev)gpio_set_value (dssdev->reset_gpio,0 ); } +static struct generic_dpi_panel_data dvi_panel = { + .name ="generic" , +}; +static struct omap_dss_device beagle_dvi_device = { - .type =OMAP_DISPLAY_TYPE_DPI , .name ="dvi" , - .driver_name ="generic_panel" , - .phy.dpi.data_lines =24 , + .driver_name ="generic_dpi_panel" , + .data = &dvi_panel, .reset_gpio =170 , .platform_enable = beagle_enable_dvi, .platform_disable = beagle_disable_dvi,
arch/arm/mach-omap2/board-omap3evm.c +7 -3
@@ -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,11 +302,14 @@ static void omap3_evm_disable_dvi(struct omap_dss_device *dssdev) dvi_enabled =0 ; } +static struct generic_dpi_panel_data dvi_panel = { + .name ="generic" , +}; +static struct omap_dss_device omap3_evm_dvi_device = { .name ="dvi" , - .driver_name ="generic_panel" , - .type =OMAP_DISPLAY_TYPE_DPI , - .phy.dpi.data_lines =24 , + .driver_name ="generic_dpi_panel" , + .data = &dvi_panel, .platform_enable = omap3_evm_enable_dvi, .platform_disable = omap3_evm_disable_dvi, };
arch/arm/mach-omap2/board-omap3stalker.c +13 -6
@@ -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,11 +161,14 @@ static void omap3_stalker_disable_lcd(struct omap_dss_device *dssdev) lcd_enabled =0 ; } +static struct generic_dpi_panel_data lcd_panel = { + .name ="generic" , +}; +static struct omap_dss_device omap3_stalker_lcd_device = { .name ="lcd" , - .driver_name ="generic_panel" , - .phy.dpi.data_lines =24 , - .type =OMAP_DISPLAY_TYPE_DPI , + .driver_name ="generic_dpi_panel" , + .data = &lcd_panel, .platform_enable = omap3_stalker_enable_lcd, .platform_disable = omap3_stalker_disable_lcd, };
@@ -208,11 +212,14 @@ static void omap3_stalker_disable_dvi(struct omap_dss_device *dssdev) dvi_enabled =0 ; } +static struct generic_dpi_panel_data dvi_panel = { + .name ="generic" , +}; +static struct omap_dss_device omap3_stalker_dvi_device = { .name ="dvi" , - .driver_name ="generic_panel" , - .type =OMAP_DISPLAY_TYPE_DPI , - .phy.dpi.data_lines =24 , + .driver_name ="generic_dpi_panel" , + .data = &dvi_panel, .platform_enable = omap3_stalker_enable_dvi, .platform_disable = omap3_stalker_disable_dvi, };
Signature · 1 line
1.7.1
PATCH 3/3 OMAP: DSS2: remove generic DPI panel driver duplicated panel drivers
In reply to Bryan WuStill keep sharp_ls_panel driver, because it contains blacklight control driver.
--- 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
drivers/video/omap2/displays/Kconfig +0 -18
@@ -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
drivers/video/omap2/displays/Makefile +0 -3
@@ -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
drivers/video/omap2/displays/panel-generic.c deleted +0 -174
174 lines not on this page · raw message
drivers/video/omap2/displays/panel-sharp-lq043t1dg01.c deleted +0 -165
165 lines not on this page · raw message
drivers/video/omap2/displays/panel-toppoly-tdo35s.c deleted +0 -164
164 lines not on this page · raw message
Signature · 1 line
1.7.1