From: Mika Laitio Date: Fri, 6 Feb 2009 16:13:03 +0000 (+0200) Subject: h63xx: lcd support patch converted from 2.6.16 to 2.6.28 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=42e9b405cb527c0bc85385b21de5167a2fc7196e;p=linux-2.6-omap-h63xx.git h63xx: lcd support patch converted from 2.6.16 to 2.6.28 --- diff --git a/arch/arm/mach-omap1/board-h6300.c b/arch/arm/mach-omap1/board-h6300.c index 94b9c1458d6..749db4b3b61 100644 --- a/arch/arm/mach-omap1/board-h6300.c +++ b/arch/arm/mach-omap1/board-h6300.c @@ -18,7 +18,6 @@ #include #include #include - #include #include @@ -29,6 +28,24 @@ #include #include #include +#include + +static struct platform_device h6300_lcd_device = { + .name = "lcd_h6300", + .id = -1, +}; + +static struct platform_device *h6300_devices[] __initdata = { + &h6300_lcd_device, +}; + +static struct omap_lcd_config h6300_lcd_config __initdata = { + .ctrl_name = "internal", +}; + +static struct omap_board_config_kernel h6300_config[] = { + { OMAP_TAG_LCD, &h6300_lcd_config }, +}; static void __init h6300_init_irq(void) { @@ -39,6 +56,14 @@ static void __init h6300_init_irq(void) static void __init h6300_init(void) { + int ret; + + ret = platform_add_devices(h6300_devices, ARRAY_SIZE(h6300_devices)); + if (ret) { + printk(KERN_WARNING "Unable to add h6300 platform devices."); + } + omap_board_config = h6300_config; + omap_board_config_size = ARRAY_SIZE(h6300_config); omap_serial_init(); omap_register_i2c_bus(1, 100, NULL, 0); } diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index 9b697a41d77..7f44f089068 100755 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c @@ -2123,6 +2123,10 @@ static void set_b1_regs(void) } if (omap_dma_in_1510_mode()) { + u16 l = omap_readw(OMAP1510_DMA_LCD_CTRL); + l &= ~(1 << 6); + omap_writew (l, OMAP1510_DMA_LCD_CTRL); + omap_writew(top >> 16, OMAP1510_DMA_LCD_TOP_F1_U); omap_writew(top, OMAP1510_DMA_LCD_TOP_F1_L); omap_writew(bottom >> 16, OMAP1510_DMA_LCD_BOT_F1_U); diff --git a/drivers/video/omap/Makefile b/drivers/video/omap/Makefile index b63b198d1f0..fe3eba53ddb 100644 --- a/drivers/video/omap/Makefile +++ b/drivers/video/omap/Makefile @@ -25,6 +25,7 @@ objs-y$(CONFIG_MACH_OMAP_PALMZ71) += lcd_palmz71.o objs-$(CONFIG_ARCH_OMAP16XX)$(CONFIG_MACH_OMAP_INNOVATOR) += lcd_inn1610.o objs-$(CONFIG_ARCH_OMAP15XX)$(CONFIG_MACH_OMAP_INNOVATOR) += lcd_inn1510.o objs-y$(CONFIG_MACH_OMAP_OSK) += lcd_osk.o +objs-$(CONFIG_ARCH_OMAP15XX)$(CONFIG_MACH_OMAP_H6300) += lcd_h6300.o objs-y$(CONFIG_MACH_OMAP_APOLLON) += lcd_apollon.o objs-y$(CONFIG_MACH_OMAP_2430SDP) += lcd_2430sdp.o diff --git a/drivers/video/omap/lcd_h6300.c b/drivers/video/omap/lcd_h6300.c new file mode 100644 index 00000000000..79cf2ccd888 --- /dev/null +++ b/drivers/video/omap/lcd_h6300.c @@ -0,0 +1,144 @@ +/* + * File: drivers/video/omap_new/lcd-h6300.c + * + * LCD panel support for the TI OMAP1510 based iPAQ h63xx series of mobile phones. + * (h6315, h6340 and h6365) + * + * Copyright (C) 2009 Mika Laitio + * Copyright (C) 2009 Husam Senussi + * + * 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 +#include +#include + +#include +#include + +/* #define OMAPFB_DBG 1 */ + +//static struct clk *h6300_lcd_ck; + +static int h6300_panel_init(struct omapfb_device *fbdev) +{ +/* + if ((h6300_lcd_ck = clk_get (NULL, "lcd_ck")) == NULL) { + printk(KERN_ERR "Unable to get the clock LCD_CK!!!\n"); + return -EPERM; + } clk_enable(h6300_lcd_ck); +*/ + printk(KERN_INFO "lcd_h6300.c: h6300_panel_init() done\n"); + return 0; +} + +static void h6300_panel_cleanup(void) +{ +/* + if (h6300_lcd_ck) { + clk_disable(h6300_lcd_ck); + clk_put(h6300_lcd_ck); + h6300_lcd_ck = NULL; + } +*/ + printk(KERN_INFO "lcd_h6300.c: h6300_panel_cleanup() done\n"); +} + +static int h6300_panel_enable(void) +{ + printk(KERN_INFO "lcd_h6300.c: h6300_panel_enable() done\n"); + return 0; +} + +static void h6300_panel_disable(void) +{ + printk(KERN_INFO "lcd_h6300.c: h6300_panel_disable() done\n"); +} + +static unsigned long h6300_panel_get_caps(void) +{ + printk(KERN_INFO "lcd_h6300.c: h6300_panel_get_caps() called\n"); + return 0; +} + +struct lcd_panel h6300_panel = { + .name = "h6300", + .config = OMAP_LCDC_PANEL_TFT, + + .bpp = 16, + .data_lines = 16, + .x_res = 240, + .y_res = 320, + .pixel_clock = 21000, + .hsw = 12, + .hfp = 10, + .hbp = 10, + .vsw = 3, + .vfp = 10, + .vbp = 3, + .pcd = 0, + + .init = h6300_panel_init, + .cleanup = h6300_panel_cleanup, + .enable = h6300_panel_enable, + .disable = h6300_panel_disable, + .get_caps = h6300_panel_get_caps, +}; + +static int h6300_panel_probe(struct platform_device *pdev) +{ + omapfb_register_panel(&h6300_panel); + return 0; +} + +static int h6300_panel_remove(struct platform_device *pdev) +{ + return 0; +} + +static int h6300_panel_suspend(struct platform_device *pdev, pm_message_t mesg) +{ + return 0; +} + +static int h6300_panel_resume(struct platform_device *pdev) +{ + return 0; +} + +struct platform_driver h6300_panel_driver = { + .probe = h6300_panel_probe, + .remove = h6300_panel_remove, + .suspend = h6300_panel_suspend, + .resume = h6300_panel_resume, + .driver = { + .name = "lcd_h6300", + .owner = THIS_MODULE, + }, +}; + +static int h6300_panel_drv_init(void) +{ + return platform_driver_register(&h6300_panel_driver); +} + +static void h6300_panel_drv_cleanup(void) +{ + platform_driver_unregister(&h6300_panel_driver); +} + +module_init(h6300_panel_drv_init); +module_exit(h6300_panel_drv_cleanup);