| Message ID | 1304926567-26814-5-git-send-email-tomi.valkeinen@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Tomi Valkeinen |
| Headers | show |
Acked-by: Stanley Miao <stanley.miao@windriver.com> Stanley. Tomi Valkeinen wrote: > Port the old omapfb panel driver to DSS2i. This patch changes the board > file only, the driver is ported in separate patch. > > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > Cc: Stanley Miao <stanley.miao@windriver.com> > --- > arch/arm/mach-omap2/board-ldp.c | 73 +++++++++++++++++++++++++++++++++----- > 1 files changed, 63 insertions(+), 10 deletions(-) > > diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c > index e2ba779..2fdfd7f 100644 > --- a/arch/arm/mach-omap2/board-ldp.c > +++ b/arch/arm/mach-omap2/board-ldp.c > @@ -43,6 +43,8 @@ > > #include <asm/delay.h> > #include <plat/usb.h> > +#include <plat/display.h> > +#include <plat/panel-generic-dpi.h> > > #include "board-flash.h" > #include "mux.h" > @@ -275,19 +277,71 @@ static inline void __init ldp_init_smsc911x(void) > gpio_direction_input(eth_gpio); > } > > -static struct platform_device ldp_lcd_device = { > - .name = "ldp_lcd", > - .id = -1, > +/* LCD */ > + > +#define LCD_PANEL_BACKLIGHT_GPIO (15 + OMAP_MAX_GPIO_LINES) > +#define LCD_PANEL_ENABLE_GPIO (7 + OMAP_MAX_GPIO_LINES) > +#define LCD_PANEL_RESET_GPIO 55 > +#define LCD_PANEL_QVGA_GPIO 56 > + > +static int ldp_panel_enable_lcd(struct omap_dss_device *dssdev) > +{ > + gpio_direction_output(LCD_PANEL_ENABLE_GPIO, 1); > + gpio_direction_output(LCD_PANEL_BACKLIGHT_GPIO, 1); > + > + return 0; > +} > + > +static void ldp_panel_disable_lcd(struct omap_dss_device *dssdev) > +{ > + gpio_direction_output(LCD_PANEL_ENABLE_GPIO, 0); > + gpio_direction_output(LCD_PANEL_BACKLIGHT_GPIO, 0); > +} > + > +static struct panel_generic_dpi_data ldp_panel_data = { > + .name = "2430sdp", > + .platform_enable = ldp_panel_enable_lcd, > + .platform_disable = ldp_panel_disable_lcd, > }; > > -static struct omap_lcd_config ldp_lcd_config __initdata = { > - .ctrl_name = "internal", > +static struct omap_dss_device ldp_lcd_device = { > + .name = "lcd", > + .driver_name = "generic_dpi_panel", > + .type = OMAP_DISPLAY_TYPE_DPI, > + .phy.dpi.data_lines = 16, > + .data = &ldp_panel_data, > }; > > -static struct omap_board_config_kernel ldp_config[] __initdata = { > - { OMAP_TAG_LCD, &ldp_lcd_config }, > +static struct omap_dss_device *ldp_dss_devices[] = { > + &ldp_lcd_device, > +}; > + > +static struct omap_dss_board_info ldp_dss_data = { > + .num_devices = ARRAY_SIZE(ldp_dss_devices), > + .devices = ldp_dss_devices, > + .default_device = &ldp_lcd_device, > }; > > +static void __init ldp_display_init(void) > +{ > + int r; > + > + struct gpio gpios[] = { > + {LCD_PANEL_RESET_GPIO, GPIOF_OUT_INIT_HIGH, "LCD RESET"}, > + {LCD_PANEL_QVGA_GPIO, GPIOF_OUT_INIT_HIGH, "LCD QVGA"}, > + {LCD_PANEL_ENABLE_GPIO, GPIOF_OUT_INIT_LOW, "LCD ENABLE"}, > + {LCD_PANEL_BACKLIGHT_GPIO, GPIOF_OUT_INIT_LOW, "LCD BACKLIGHT"}, > + }; > + > + r = gpio_request_array(gpios, ARRAY_SIZE(gpios)); > + if (r) { > + pr_err("Cannot request LCD GPIOs, error %d\n", r); > + return; > + } > + > + omap_display_init(&ldp_dss_data); > +} > + > static void __init omap_ldp_init_early(void) > { > omap2_init_common_infrastructure(); > @@ -390,7 +444,6 @@ static struct omap2_hsmmc_info mmc[] __initdata = { > > static struct platform_device *ldp_devices[] __initdata = { > &ldp_smsc911x_device, > - &ldp_lcd_device, > &ldp_gpio_keys_device, > }; > > @@ -441,8 +494,6 @@ static struct mtd_partition ldp_nand_partitions[] = { > static void __init omap_ldp_init(void) > { > omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); > - omap_board_config = ldp_config; > - omap_board_config_size = ARRAY_SIZE(ldp_config); > ldp_init_smsc911x(); > omap_i2c_init(); > platform_add_devices(ldp_devices, ARRAY_SIZE(ldp_devices)); > @@ -459,6 +510,8 @@ static void __init omap_ldp_init(void) > omap2_hsmmc_init(mmc); > /* link regulators to MMC adapters */ > ldp_vmmc1_supply.dev = mmc[0].dev; > + > + ldp_display_init(); > } > > MACHINE_START(OMAP_LDP, "OMAP LDP board") -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> -----Original Message----- > From: linux-omap-owner@vger.kernel.org [mailto:linux-omap- > owner@vger.kernel.org] On Behalf Of Valkeinen, Tomi > Sent: Monday, May 09, 2011 1:06 PM > To: tony@atomide.com > Cc: linux-omap@vger.kernel.org; Valkeinen, Tomi; Stanley Miao > Subject: [PATCH 4/6] OMAP: LDP: Port the display driver to new DSS2 > > Port the old omapfb panel driver to DSS2i. This patch changes the board > file only, the driver is ported in separate patch. > > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > Cc: Stanley Miao <stanley.miao@windriver.com> > --- > arch/arm/mach-omap2/board-ldp.c | 73 +++++++++++++++++++++++++++++++++- > ---- > 1 files changed, 63 insertions(+), 10 deletions(-) > > diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board- > ldp.c > index e2ba779..2fdfd7f 100644 > --- a/arch/arm/mach-omap2/board-ldp.c > +++ b/arch/arm/mach-omap2/board-ldp.c > @@ -43,6 +43,8 @@ > > #include <asm/delay.h> > #include <plat/usb.h> > +#include <plat/display.h> > +#include <plat/panel-generic-dpi.h> > > #include "board-flash.h" > #include "mux.h" > @@ -275,19 +277,71 @@ static inline void __init ldp_init_smsc911x(void) > gpio_direction_input(eth_gpio); > } > > -static struct platform_device ldp_lcd_device = { > - .name = "ldp_lcd", > - .id = -1, > +/* LCD */ > + > +#define LCD_PANEL_BACKLIGHT_GPIO (15 + OMAP_MAX_GPIO_LINES) > +#define LCD_PANEL_ENABLE_GPIO (7 + OMAP_MAX_GPIO_LINES) > +#define LCD_PANEL_RESET_GPIO 55 > +#define LCD_PANEL_QVGA_GPIO 56 > + > +static int ldp_panel_enable_lcd(struct omap_dss_device *dssdev) > +{ > + gpio_direction_output(LCD_PANEL_ENABLE_GPIO, 1); > + gpio_direction_output(LCD_PANEL_BACKLIGHT_GPIO, 1); > + > + return 0; > +} > + > +static void ldp_panel_disable_lcd(struct omap_dss_device *dssdev) > +{ > + gpio_direction_output(LCD_PANEL_ENABLE_GPIO, 0); > + gpio_direction_output(LCD_PANEL_BACKLIGHT_GPIO, 0); > +} > + > +static struct panel_generic_dpi_data ldp_panel_data = { > + .name = "2430sdp", LDP is a 3430 board. > + .platform_enable = ldp_panel_enable_lcd, > + .platform_disable = ldp_panel_disable_lcd, > }; > > -static struct omap_lcd_config ldp_lcd_config __initdata = { > - .ctrl_name = "internal", > +static struct omap_dss_device ldp_lcd_device = { > + .name = "lcd", > + .driver_name = "generic_dpi_panel", > + .type = OMAP_DISPLAY_TYPE_DPI, > + .phy.dpi.data_lines = 16, > + .data = &ldp_panel_data, > }; > > -static struct omap_board_config_kernel ldp_config[] __initdata = { > - { OMAP_TAG_LCD, &ldp_lcd_config }, > +static struct omap_dss_device *ldp_dss_devices[] = { > + &ldp_lcd_device, > +}; > + > +static struct omap_dss_board_info ldp_dss_data = { > + .num_devices = ARRAY_SIZE(ldp_dss_devices), > + .devices = ldp_dss_devices, > + .default_device = &ldp_lcd_device, > }; > > +static void __init ldp_display_init(void) > +{ > + int r; > + > + struct gpio gpios[] = { > + {LCD_PANEL_RESET_GPIO, GPIOF_OUT_INIT_HIGH, "LCD RESET"}, > + {LCD_PANEL_QVGA_GPIO, GPIOF_OUT_INIT_HIGH, "LCD QVGA"}, > + {LCD_PANEL_ENABLE_GPIO, GPIOF_OUT_INIT_LOW, "LCD ENABLE"}, > + {LCD_PANEL_BACKLIGHT_GPIO, GPIOF_OUT_INIT_LOW, "LCD > BACKLIGHT"}, > + }; > + > + r = gpio_request_array(gpios, ARRAY_SIZE(gpios)); > + if (r) { > + pr_err("Cannot request LCD GPIOs, error %d\n", r); > + return; > + } If I test with this patch, this request is returning error. > + > + omap_display_init(&ldp_dss_data); > +} > + > static void __init omap_ldp_init_early(void) > { > omap2_init_common_infrastructure(); > @@ -390,7 +444,6 @@ static struct omap2_hsmmc_info mmc[] __initdata = { > > static struct platform_device *ldp_devices[] __initdata = { > &ldp_smsc911x_device, > - &ldp_lcd_device, > &ldp_gpio_keys_device, > }; > > @@ -441,8 +494,6 @@ static struct mtd_partition ldp_nand_partitions[] = { > static void __init omap_ldp_init(void) > { > omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); > - omap_board_config = ldp_config; > - omap_board_config_size = ARRAY_SIZE(ldp_config); > ldp_init_smsc911x(); > omap_i2c_init(); > platform_add_devices(ldp_devices, ARRAY_SIZE(ldp_devices)); > @@ -459,6 +510,8 @@ static void __init omap_ldp_init(void) > omap2_hsmmc_init(mmc); > /* link regulators to MMC adapters */ > ldp_vmmc1_supply.dev = mmc[0].dev; > + > + ldp_display_init(); > } > > MACHINE_START(OMAP_LDP, "OMAP LDP board") > -- > 1.7.4.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 2011-05-11 at 10:28 +0530, Janorkar, Mayuresh wrote: > > > -----Original Message----- > > From: linux-omap-owner@vger.kernel.org [mailto:linux-omap- > > owner@vger.kernel.org] On Behalf Of Valkeinen, Tomi > > Sent: Monday, May 09, 2011 1:06 PM > > To: tony@atomide.com > > Cc: linux-omap@vger.kernel.org; Valkeinen, Tomi; Stanley Miao > > Subject: [PATCH 4/6] OMAP: LDP: Port the display driver to new DSS2 > > > > Port the old omapfb panel driver to DSS2i. This patch changes the board > > file only, the driver is ported in separate patch. > > > > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > > Cc: Stanley Miao <stanley.miao@windriver.com> > > --- > > arch/arm/mach-omap2/board-ldp.c | 73 +++++++++++++++++++++++++++++++++- > > ---- <snip> > > +static struct panel_generic_dpi_data ldp_panel_data = { > > + .name = "2430sdp", > > LDP is a 3430 board. That is just the name of the panel, used to find the right timings from the panel database. I first ported 2430sdp board, and called the panel that. The timings looked the same on LDP board, so I deduced it's the same panel, and used the same name. However, if you do have the board, can you find the name and type of the panel? It's usually printed in the backside of the panel, which of course may not be accessible easily. Or, if you or anyone else knows where to find information about the LDP board, schematics or datasheets, that could help also. > > +static void __init ldp_display_init(void) > > +{ > > + int r; > > + > > + struct gpio gpios[] = { > > + {LCD_PANEL_RESET_GPIO, GPIOF_OUT_INIT_HIGH, "LCD RESET"}, > > + {LCD_PANEL_QVGA_GPIO, GPIOF_OUT_INIT_HIGH, "LCD QVGA"}, > > + {LCD_PANEL_ENABLE_GPIO, GPIOF_OUT_INIT_LOW, "LCD ENABLE"}, > > + {LCD_PANEL_BACKLIGHT_GPIO, GPIOF_OUT_INIT_LOW, "LCD > > BACKLIGHT"}, > > + }; > > + > > + r = gpio_request_array(gpios, ARRAY_SIZE(gpios)); > > + if (r) { > > + pr_err("Cannot request LCD GPIOs, error %d\n", r); > > + return; > > + } > > If I test with this patch, this request is returning error. Hmm. Well, the GPIOs are the same as in the old driver. However, the old driver doesn't even seem to check if it manages to request the GPIOs, so it may well be that it was failing also. Can you check from /sys/class/gpio/ if some of the GPIOs are already allocated: 207, 199, 55, 56? The definition of two of those GPIOs look kinda funny to me: (15 + OMAP_MAX_GPIO_LINES). I don't know what OMAP_MAX_GPIO_LINES means, but it sure doesn't sound ok to have a GPIO number that is 15 over the maximum =). Tomi -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 05/11/11 09:32, Tomi Valkeinen wrote: > On Wed, 2011-05-11 at 10:28 +0530, Janorkar, Mayuresh wrote: > >>> +static void __init ldp_display_init(void) >>> +{ >>> + int r; >>> + >>> + struct gpio gpios[] = { >>> + {LCD_PANEL_RESET_GPIO, GPIOF_OUT_INIT_HIGH, "LCD RESET"}, >>> + {LCD_PANEL_QVGA_GPIO, GPIOF_OUT_INIT_HIGH, "LCD QVGA"}, >>> + {LCD_PANEL_ENABLE_GPIO, GPIOF_OUT_INIT_LOW, "LCD ENABLE"}, >>> + {LCD_PANEL_BACKLIGHT_GPIO, GPIOF_OUT_INIT_LOW, "LCD >>> BACKLIGHT"}, >>> + }; >>> + >>> + r = gpio_request_array(gpios, ARRAY_SIZE(gpios)); >>> + if (r) { >>> + pr_err("Cannot request LCD GPIOs, error %d\n", r); >>> + return; >>> + } >> If I test with this patch, this request is returning error. > Hmm. Well, the GPIOs are the same as in the old driver. However, the old > driver doesn't even seem to check if it manages to request the GPIOs, so > it may well be that it was failing also. > > Can you check from /sys/class/gpio/ if some of the GPIOs are already > allocated: 207, 199, 55, 56? > > The definition of two of those GPIOs look kinda funny to me: (15 + > OMAP_MAX_GPIO_LINES). I don't know what OMAP_MAX_GPIO_LINES means, but > it sure doesn't sound ok to have a GPIO number that is 15 over the > maximum =). > This means that some kind of gpio expander is used. I bet those are twl gpios (or may be some other discrete chip). If those are twl gpios then you need to provide the .setup callback in struct twl4030_gpio_platform_data which will request and setup those gpios.
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index e2ba779..2fdfd7f 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c @@ -43,6 +43,8 @@ #include <asm/delay.h> #include <plat/usb.h> +#include <plat/display.h> +#include <plat/panel-generic-dpi.h> #include "board-flash.h" #include "mux.h" @@ -275,19 +277,71 @@ static inline void __init ldp_init_smsc911x(void) gpio_direction_input(eth_gpio); } -static struct platform_device ldp_lcd_device = { - .name = "ldp_lcd", - .id = -1, +/* LCD */ + +#define LCD_PANEL_BACKLIGHT_GPIO (15 + OMAP_MAX_GPIO_LINES) +#define LCD_PANEL_ENABLE_GPIO (7 + OMAP_MAX_GPIO_LINES) +#define LCD_PANEL_RESET_GPIO 55 +#define LCD_PANEL_QVGA_GPIO 56 + +static int ldp_panel_enable_lcd(struct omap_dss_device *dssdev) +{ + gpio_direction_output(LCD_PANEL_ENABLE_GPIO, 1); + gpio_direction_output(LCD_PANEL_BACKLIGHT_GPIO, 1); + + return 0; +} + +static void ldp_panel_disable_lcd(struct omap_dss_device *dssdev) +{ + gpio_direction_output(LCD_PANEL_ENABLE_GPIO, 0); + gpio_direction_output(LCD_PANEL_BACKLIGHT_GPIO, 0); +} + +static struct panel_generic_dpi_data ldp_panel_data = { + .name = "2430sdp", + .platform_enable = ldp_panel_enable_lcd, + .platform_disable = ldp_panel_disable_lcd, }; -static struct omap_lcd_config ldp_lcd_config __initdata = { - .ctrl_name = "internal", +static struct omap_dss_device ldp_lcd_device = { + .name = "lcd", + .driver_name = "generic_dpi_panel", + .type = OMAP_DISPLAY_TYPE_DPI, + .phy.dpi.data_lines = 16, + .data = &ldp_panel_data, }; -static struct omap_board_config_kernel ldp_config[] __initdata = { - { OMAP_TAG_LCD, &ldp_lcd_config }, +static struct omap_dss_device *ldp_dss_devices[] = { + &ldp_lcd_device, +}; + +static struct omap_dss_board_info ldp_dss_data = { + .num_devices = ARRAY_SIZE(ldp_dss_devices), + .devices = ldp_dss_devices, + .default_device = &ldp_lcd_device, }; +static void __init ldp_display_init(void) +{ + int r; + + struct gpio gpios[] = { + {LCD_PANEL_RESET_GPIO, GPIOF_OUT_INIT_HIGH, "LCD RESET"}, + {LCD_PANEL_QVGA_GPIO, GPIOF_OUT_INIT_HIGH, "LCD QVGA"}, + {LCD_PANEL_ENABLE_GPIO, GPIOF_OUT_INIT_LOW, "LCD ENABLE"}, + {LCD_PANEL_BACKLIGHT_GPIO, GPIOF_OUT_INIT_LOW, "LCD BACKLIGHT"}, + }; + + r = gpio_request_array(gpios, ARRAY_SIZE(gpios)); + if (r) { + pr_err("Cannot request LCD GPIOs, error %d\n", r); + return; + } + + omap_display_init(&ldp_dss_data); +} + static void __init omap_ldp_init_early(void) { omap2_init_common_infrastructure(); @@ -390,7 +444,6 @@ static struct omap2_hsmmc_info mmc[] __initdata = { static struct platform_device *ldp_devices[] __initdata = { &ldp_smsc911x_device, - &ldp_lcd_device, &ldp_gpio_keys_device, }; @@ -441,8 +494,6 @@ static struct mtd_partition ldp_nand_partitions[] = { static void __init omap_ldp_init(void) { omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); - omap_board_config = ldp_config; - omap_board_config_size = ARRAY_SIZE(ldp_config); ldp_init_smsc911x(); omap_i2c_init(); platform_add_devices(ldp_devices, ARRAY_SIZE(ldp_devices)); @@ -459,6 +510,8 @@ static void __init omap_ldp_init(void) omap2_hsmmc_init(mmc); /* link regulators to MMC adapters */ ldp_vmmc1_supply.dev = mmc[0].dev; + + ldp_display_init(); } MACHINE_START(OMAP_LDP, "OMAP LDP board")
Port the old omapfb panel driver to DSS2i. This patch changes the board file only, the driver is ported in separate patch. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Cc: Stanley Miao <stanley.miao@windriver.com> --- arch/arm/mach-omap2/board-ldp.c | 73 +++++++++++++++++++++++++++++++++----- 1 files changed, 63 insertions(+), 10 deletions(-)