Message ID | 833ed44e61e3d4093eb27b55b97252967e042d41.1244131952.git.imre.deak@nokia.com (mailing list archive) |
---|---|
State | Not Applicable, archived |
Delegated to: | Tomi Valkeinen |
Headers | show |
Thursday 04 June 2009 19:52:29 Imre Deak napisał(a): > From: Jonathan McDowell <noodles@earth.li> > > This is an updated version of the LCD driver for the Amstrad Delta to > take into account the recent changes to the omapfb infrastructure. The > Delta features a 480x320 12 bit DSTN panel. Hi, I'd really love to see the lcd_ams_delta support included in the mainline kernel, but I am not sure if it is ready for submission, as I still have issues with it. It does work perfectly unless power management is turned on. With CONFIG_PM=y, the omapfb device, after initially starting correctly, breaks with the following error messages: omapfb omapfb: resetting (status 0xffffff96,reset count 1) ... omapfb omapfb: resetting (status 0xffffff96,reset count 100) omapfb omapfb: too many reset attempts, giving up. Tested with linux-2.6.30-rc5 and linux-omap revision 90e758af52ba803cba233fabee81176d99589f09. Error messages do not appear when CONFIG_PM=n or lcd_ams_delta.o is removed from omapfb-objs. Please let me know what else I can do to help in resolving this issue. Cheers, Janusz > Signed-off-by: Jonathan McDowell <noodles@earth.li> > Signed-off-by: Tony Lindgren <tony@atomide.com> > Signed-off-by: Imre Deak <imre.deak@nokia.com> > --- > drivers/video/omap/Makefile | 1 + > drivers/video/omap/lcd_ams_delta.c | 137 > ++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+), 0 > deletions(-) > create mode 100644 drivers/video/omap/lcd_ams_delta.c > > diff --git a/drivers/video/omap/Makefile b/drivers/video/omap/Makefile > index d86d54a..2bf94ad 100644 > --- a/drivers/video/omap/Makefile > +++ b/drivers/video/omap/Makefile > @@ -15,6 +15,7 @@ objs-$(CONFIG_ARCH_OMAP2)$(CONFIG_FB_OMAP_LCDC_EXTERNAL) > += rfbi.o objs-y$(CONFIG_FB_OMAP_LCDC_HWA742) += hwa742.o > objs-y$(CONFIG_FB_OMAP_LCDC_BLIZZARD) += blizzard.o > > +objs-y$(CONFIG_MACH_AMS_DELTA) += lcd_ams_delta.o > objs-y$(CONFIG_MACH_OMAP_H4) += lcd_h4.o > objs-y$(CONFIG_MACH_OMAP_H3) += lcd_h3.o > objs-y$(CONFIG_MACH_OMAP_PALMTE) += lcd_palmte.o > diff --git a/drivers/video/omap/lcd_ams_delta.c > b/drivers/video/omap/lcd_ams_delta.c new file mode 100644 > index 0000000..1f74399 > --- /dev/null > +++ b/drivers/video/omap/lcd_ams_delta.c > @@ -0,0 +1,137 @@ > +/* > + * Based on drivers/video/omap/lcd_inn1510.c > + * > + * LCD panel support for the Amstrad E3 (Delta) videophone. > + * > + * Copyright (C) 2006 Jonathan McDowell <noodles@earth.li> > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms of the GNU General Public License as published by the > + * Free Software Foundation; either version 2 of the License, or (at your > + * option) any later version. > + * > + * 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, write to the Free Software Foundation, Inc., > + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. > + */ > + > +#include <linux/module.h> > +#include <linux/platform_device.h> > +#include <linux/io.h> > +#include <linux/delay.h> > + > +#include <mach/board-ams-delta.h> > +#include <mach/hardware.h> > +#include <mach/omapfb.h> > + > +#define AMS_DELTA_DEFAULT_CONTRAST 112 > + > +static int ams_delta_panel_init(struct lcd_panel *panel, > + struct omapfb_device *fbdev) > +{ > + return 0; > +} > + > +static void ams_delta_panel_cleanup(struct lcd_panel *panel) > +{ > +} > + > +static int ams_delta_panel_enable(struct lcd_panel *panel) > +{ > + ams_delta_latch2_write(AMS_DELTA_LATCH2_LCD_NDISP, > + AMS_DELTA_LATCH2_LCD_NDISP); > + ams_delta_latch2_write(AMS_DELTA_LATCH2_LCD_VBLEN, > + AMS_DELTA_LATCH2_LCD_VBLEN); > + > + omap_writeb(1, OMAP_PWL_CLK_ENABLE); > + omap_writeb(AMS_DELTA_DEFAULT_CONTRAST, OMAP_PWL_ENABLE); > + > + return 0; > +} > + > +static void ams_delta_panel_disable(struct lcd_panel *panel) > +{ > + ams_delta_latch2_write(AMS_DELTA_LATCH2_LCD_VBLEN, 0); > + ams_delta_latch2_write(AMS_DELTA_LATCH2_LCD_NDISP, 0); > +} > + > +static unsigned long ams_delta_panel_get_caps(struct lcd_panel *panel) > +{ > + return 0; > +} > + > +static struct lcd_panel ams_delta_panel = { > + .name = "ams-delta", > + .config = 0, > + > + .bpp = 12, > + .data_lines = 16, > + .x_res = 480, > + .y_res = 320, > + .pixel_clock = 4687, > + .hsw = 3, > + .hfp = 1, > + .hbp = 1, > + .vsw = 1, > + .vfp = 0, > + .vbp = 0, > + .pcd = 0, > + .acb = 37, > + > + .init = ams_delta_panel_init, > + .cleanup = ams_delta_panel_cleanup, > + .enable = ams_delta_panel_enable, > + .disable = ams_delta_panel_disable, > + .get_caps = ams_delta_panel_get_caps, > +}; > + > +static int ams_delta_panel_probe(struct platform_device *pdev) > +{ > + omapfb_register_panel(&ams_delta_panel); > + return 0; > +} > + > +static int ams_delta_panel_remove(struct platform_device *pdev) > +{ > + return 0; > +} > + > +static int ams_delta_panel_suspend(struct platform_device *pdev, > + pm_message_t mesg) > +{ > + return 0; > +} > + > +static int ams_delta_panel_resume(struct platform_device *pdev) > +{ > + return 0; > +} > + > +struct platform_driver ams_delta_panel_driver = { > + .probe = ams_delta_panel_probe, > + .remove = ams_delta_panel_remove, > + .suspend = ams_delta_panel_suspend, > + .resume = ams_delta_panel_resume, > + .driver = { > + .name = "lcd_ams_delta", > + .owner = THIS_MODULE, > + }, > +}; > + > +static int ams_delta_panel_drv_init(void) > +{ > + return platform_driver_register(&ams_delta_panel_driver); > +} > + > +static void ams_delta_panel_drv_cleanup(void) > +{ > + platform_driver_unregister(&ams_delta_panel_driver); > +} > + > +module_init(ams_delta_panel_drv_init); > +module_exit(ams_delta_panel_drv_cleanup); -- 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
TIS - Janusz Krzysztofik napisał(a): > Thursday 04 June 2009 19:52:29 Imre Deak napisał(a): >> From: Jonathan McDowell <noodles@earth.li> >> >> This is an updated version of the LCD driver for the Amstrad Delta to >> take into account the recent changes to the omapfb infrastructure. The >> Delta features a 480x320 12 bit DSTN panel. > > Hi, > > I'd really love to see the lcd_ams_delta support included in the mainline > kernel, but I am not sure if it is ready for submission, as I still have > issues with it. It does work perfectly unless power management is turned on. > With CONFIG_PM=y, the omapfb device, after initially starting correctly, > breaks with the following error messages: > > omapfb omapfb: resetting (status 0xffffff96,reset count 1) > ... > omapfb omapfb: resetting (status 0xffffff96,reset count 100) > omapfb omapfb: too many reset attempts, giving up. > > Tested with linux-2.6.30-rc5 and linux-omap revision > 90e758af52ba803cba233fabee81176d99589f09. Error messages do not appear when > CONFIG_PM=n or lcd_ams_delta.o is removed from omapfb-objs. One idea for a temporary workaround: maybe we could just force PM=n in case of MACH_AMS_DELTA && FB_OMAP? PM already depends on !IA64_HP_SIM. Janusz > Please let me know what else I can do to help in resolving this issue. > > Cheers, > Janusz > >> Signed-off-by: Jonathan McDowell <noodles@earth.li> >> Signed-off-by: Tony Lindgren <tony@atomide.com> >> Signed-off-by: Imre Deak <imre.deak@nokia.com> >> --- >> drivers/video/omap/Makefile | 1 + >> drivers/video/omap/lcd_ams_delta.c | 137 >> ++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+), 0 >> deletions(-) >> create mode 100644 drivers/video/omap/lcd_ams_delta.c >> >> diff --git a/drivers/video/omap/Makefile b/drivers/video/omap/Makefile >> index d86d54a..2bf94ad 100644 >> --- a/drivers/video/omap/Makefile >> +++ b/drivers/video/omap/Makefile >> @@ -15,6 +15,7 @@ objs-$(CONFIG_ARCH_OMAP2)$(CONFIG_FB_OMAP_LCDC_EXTERNAL) >> += rfbi.o objs-y$(CONFIG_FB_OMAP_LCDC_HWA742) += hwa742.o >> objs-y$(CONFIG_FB_OMAP_LCDC_BLIZZARD) += blizzard.o >> >> +objs-y$(CONFIG_MACH_AMS_DELTA) += lcd_ams_delta.o >> objs-y$(CONFIG_MACH_OMAP_H4) += lcd_h4.o >> objs-y$(CONFIG_MACH_OMAP_H3) += lcd_h3.o >> objs-y$(CONFIG_MACH_OMAP_PALMTE) += lcd_palmte.o >> diff --git a/drivers/video/omap/lcd_ams_delta.c >> b/drivers/video/omap/lcd_ams_delta.c new file mode 100644 >> index 0000000..1f74399 >> --- /dev/null >> +++ b/drivers/video/omap/lcd_ams_delta.c >> @@ -0,0 +1,137 @@ >> +/* >> + * Based on drivers/video/omap/lcd_inn1510.c >> + * >> + * LCD panel support for the Amstrad E3 (Delta) videophone. >> + * >> + * Copyright (C) 2006 Jonathan McDowell <noodles@earth.li> >> + * >> + * This program is free software; you can redistribute it and/or modify it >> + * under the terms of the GNU General Public License as published by the >> + * Free Software Foundation; either version 2 of the License, or (at your >> + * option) any later version. >> + * >> + * 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, write to the Free Software Foundation, Inc., >> + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. >> + */ >> + >> +#include <linux/module.h> >> +#include <linux/platform_device.h> >> +#include <linux/io.h> >> +#include <linux/delay.h> >> + >> +#include <mach/board-ams-delta.h> >> +#include <mach/hardware.h> >> +#include <mach/omapfb.h> >> + >> +#define AMS_DELTA_DEFAULT_CONTRAST 112 >> + >> +static int ams_delta_panel_init(struct lcd_panel *panel, >> + struct omapfb_device *fbdev) >> +{ >> + return 0; >> +} >> + >> +static void ams_delta_panel_cleanup(struct lcd_panel *panel) >> +{ >> +} >> + >> +static int ams_delta_panel_enable(struct lcd_panel *panel) >> +{ >> + ams_delta_latch2_write(AMS_DELTA_LATCH2_LCD_NDISP, >> + AMS_DELTA_LATCH2_LCD_NDISP); >> + ams_delta_latch2_write(AMS_DELTA_LATCH2_LCD_VBLEN, >> + AMS_DELTA_LATCH2_LCD_VBLEN); >> + >> + omap_writeb(1, OMAP_PWL_CLK_ENABLE); >> + omap_writeb(AMS_DELTA_DEFAULT_CONTRAST, OMAP_PWL_ENABLE); >> + >> + return 0; >> +} >> + >> +static void ams_delta_panel_disable(struct lcd_panel *panel) >> +{ >> + ams_delta_latch2_write(AMS_DELTA_LATCH2_LCD_VBLEN, 0); >> + ams_delta_latch2_write(AMS_DELTA_LATCH2_LCD_NDISP, 0); >> +} >> + >> +static unsigned long ams_delta_panel_get_caps(struct lcd_panel *panel) >> +{ >> + return 0; >> +} >> + >> +static struct lcd_panel ams_delta_panel = { >> + .name = "ams-delta", >> + .config = 0, >> + >> + .bpp = 12, >> + .data_lines = 16, >> + .x_res = 480, >> + .y_res = 320, >> + .pixel_clock = 4687, >> + .hsw = 3, >> + .hfp = 1, >> + .hbp = 1, >> + .vsw = 1, >> + .vfp = 0, >> + .vbp = 0, >> + .pcd = 0, >> + .acb = 37, >> + >> + .init = ams_delta_panel_init, >> + .cleanup = ams_delta_panel_cleanup, >> + .enable = ams_delta_panel_enable, >> + .disable = ams_delta_panel_disable, >> + .get_caps = ams_delta_panel_get_caps, >> +}; >> + >> +static int ams_delta_panel_probe(struct platform_device *pdev) >> +{ >> + omapfb_register_panel(&ams_delta_panel); >> + return 0; >> +} >> + >> +static int ams_delta_panel_remove(struct platform_device *pdev) >> +{ >> + return 0; >> +} >> + >> +static int ams_delta_panel_suspend(struct platform_device *pdev, >> + pm_message_t mesg) >> +{ >> + return 0; >> +} >> + >> +static int ams_delta_panel_resume(struct platform_device *pdev) >> +{ >> + return 0; >> +} >> + >> +struct platform_driver ams_delta_panel_driver = { >> + .probe = ams_delta_panel_probe, >> + .remove = ams_delta_panel_remove, >> + .suspend = ams_delta_panel_suspend, >> + .resume = ams_delta_panel_resume, >> + .driver = { >> + .name = "lcd_ams_delta", >> + .owner = THIS_MODULE, >> + }, >> +}; >> + >> +static int ams_delta_panel_drv_init(void) >> +{ >> + return platform_driver_register(&ams_delta_panel_driver); >> +} >> + >> +static void ams_delta_panel_drv_cleanup(void) >> +{ >> + platform_driver_unregister(&ams_delta_panel_driver); >> +} >> + >> +module_init(ams_delta_panel_drv_init); >> +module_exit(ams_delta_panel_drv_cleanup); > > -- 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 Fri, Jun 05, 2009 at 12:38:22PM +0200, Janusz Krzysztofik wrote: > Thursday 04 June 2009 19:52:29 Imre Deak napisał(a): > > From: Jonathan McDowell <noodles@earth.li> > > > > This is an updated version of the LCD driver for the Amstrad Delta to > > take into account the recent changes to the omapfb infrastructure. The > > Delta features a 480x320 12 bit DSTN panel. > > I'd really love to see the lcd_ams_delta support included in the mainline > kernel, but I am not sure if it is ready for submission, as I still have > issues with it. It does work perfectly unless power management is turned on. > With CONFIG_PM=y, the omapfb device, after initially starting correctly, > breaks with the following error messages: > > omapfb omapfb: resetting (status 0xffffff96,reset count 1) > ... > omapfb omapfb: resetting (status 0xffffff96,reset count 100) > omapfb omapfb: too many reset attempts, giving up. > > Tested with linux-2.6.30-rc5 and linux-omap revision > 90e758af52ba803cba233fabee81176d99589f09. Error messages do not appear when > CONFIG_PM=n or lcd_ams_delta.o is removed from omapfb-objs. > > Please let me know what else I can do to help in resolving this issue. Reporting it was a good start; it's the first I've heard of this issue. Looking at the E3 configs I have lying around it looks like none of them have CONFIG_PM set, so it's possible most people have just been using the defconfig or a minor variation of it. I don't have my E3 convenient at present to investigate however. J.
On Thu, 4 Jun 2009 20:52:29 +0300 Imre Deak <imre.deak@nokia.com> wrote: > From: Jonathan McDowell <noodles@earth.li> > > This is an updated version of the LCD driver for the Amstrad Delta to > take into account the recent changes to the omapfb infrastructure. The > Delta features a 480x320 12 bit DSTN panel. > > Signed-off-by: Jonathan McDowell <noodles@earth.li> > Signed-off-by: Tony Lindgren <tony@atomide.com> > Signed-off-by: Imre Deak <imre.deak@nokia.com> > --- Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl> ---------------------------------------------------------------------- Masz juz dosc wysokich rachunkow? Wygraj nowa mozliwosc komunikacji! Sprawdz >>> http://link.interia.pl/f21d2 -- 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
diff --git a/drivers/video/omap/Makefile b/drivers/video/omap/Makefile index d86d54a..2bf94ad 100644 --- a/drivers/video/omap/Makefile +++ b/drivers/video/omap/Makefile @@ -15,6 +15,7 @@ objs-$(CONFIG_ARCH_OMAP2)$(CONFIG_FB_OMAP_LCDC_EXTERNAL) += rfbi.o objs-y$(CONFIG_FB_OMAP_LCDC_HWA742) += hwa742.o objs-y$(CONFIG_FB_OMAP_LCDC_BLIZZARD) += blizzard.o +objs-y$(CONFIG_MACH_AMS_DELTA) += lcd_ams_delta.o objs-y$(CONFIG_MACH_OMAP_H4) += lcd_h4.o objs-y$(CONFIG_MACH_OMAP_H3) += lcd_h3.o objs-y$(CONFIG_MACH_OMAP_PALMTE) += lcd_palmte.o diff --git a/drivers/video/omap/lcd_ams_delta.c b/drivers/video/omap/lcd_ams_delta.c new file mode 100644 index 0000000..1f74399 --- /dev/null +++ b/drivers/video/omap/lcd_ams_delta.c @@ -0,0 +1,137 @@ +/* + * Based on drivers/video/omap/lcd_inn1510.c + * + * LCD panel support for the Amstrad E3 (Delta) videophone. + * + * Copyright (C) 2006 Jonathan McDowell <noodles@earth.li> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * 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, write to the Free Software Foundation, Inc., + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/io.h> +#include <linux/delay.h> + +#include <mach/board-ams-delta.h> +#include <mach/hardware.h> +#include <mach/omapfb.h> + +#define AMS_DELTA_DEFAULT_CONTRAST 112 + +static int ams_delta_panel_init(struct lcd_panel *panel, + struct omapfb_device *fbdev) +{ + return 0; +} + +static void ams_delta_panel_cleanup(struct lcd_panel *panel) +{ +} + +static int ams_delta_panel_enable(struct lcd_panel *panel) +{ + ams_delta_latch2_write(AMS_DELTA_LATCH2_LCD_NDISP, + AMS_DELTA_LATCH2_LCD_NDISP); + ams_delta_latch2_write(AMS_DELTA_LATCH2_LCD_VBLEN, + AMS_DELTA_LATCH2_LCD_VBLEN); + + omap_writeb(1, OMAP_PWL_CLK_ENABLE); + omap_writeb(AMS_DELTA_DEFAULT_CONTRAST, OMAP_PWL_ENABLE); + + return 0; +} + +static void ams_delta_panel_disable(struct lcd_panel *panel) +{ + ams_delta_latch2_write(AMS_DELTA_LATCH2_LCD_VBLEN, 0); + ams_delta_latch2_write(AMS_DELTA_LATCH2_LCD_NDISP, 0); +} + +static unsigned long ams_delta_panel_get_caps(struct lcd_panel *panel) +{ + return 0; +} + +static struct lcd_panel ams_delta_panel = { + .name = "ams-delta", + .config = 0, + + .bpp = 12, + .data_lines = 16, + .x_res = 480, + .y_res = 320, + .pixel_clock = 4687, + .hsw = 3, + .hfp = 1, + .hbp = 1, + .vsw = 1, + .vfp = 0, + .vbp = 0, + .pcd = 0, + .acb = 37, + + .init = ams_delta_panel_init, + .cleanup = ams_delta_panel_cleanup, + .enable = ams_delta_panel_enable, + .disable = ams_delta_panel_disable, + .get_caps = ams_delta_panel_get_caps, +}; + +static int ams_delta_panel_probe(struct platform_device *pdev) +{ + omapfb_register_panel(&ams_delta_panel); + return 0; +} + +static int ams_delta_panel_remove(struct platform_device *pdev) +{ + return 0; +} + +static int ams_delta_panel_suspend(struct platform_device *pdev, + pm_message_t mesg) +{ + return 0; +} + +static int ams_delta_panel_resume(struct platform_device *pdev) +{ + return 0; +} + +struct platform_driver ams_delta_panel_driver = { + .probe = ams_delta_panel_probe, + .remove = ams_delta_panel_remove, + .suspend = ams_delta_panel_suspend, + .resume = ams_delta_panel_resume, + .driver = { + .name = "lcd_ams_delta", + .owner = THIS_MODULE, + }, +}; + +static int ams_delta_panel_drv_init(void) +{ + return platform_driver_register(&ams_delta_panel_driver); +} + +static void ams_delta_panel_drv_cleanup(void) +{ + platform_driver_unregister(&ams_delta_panel_driver); +} + +module_init(ams_delta_panel_drv_init); +module_exit(ams_delta_panel_drv_cleanup);