From patchwork Fri Apr 16 08:12:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kan-Ru Chen X-Patchwork-Id: 93073 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3G8EROe018049 for ; Fri, 16 Apr 2010 08:14:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757350Ab0DPIOO (ORCPT ); Fri, 16 Apr 2010 04:14:14 -0400 Received: from cp20.secserverpros.com ([67.220.217.187]:55615 "EHLO cp20.secserverpros.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757109Ab0DPIOM (ORCPT ); Fri, 16 Apr 2010 04:14:12 -0400 Received: from 61-30-10-70.static.tfn.net.tw ([61.30.10.70] helo=kanru.info) by cp20.secserverpros.com with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1O2ggZ-0002XE-Ue for linux-omap@vger.kernel.org; Fri, 16 Apr 2010 08:14:08 +0000 Received: from kanru (uid 1000) (envelope-from kanru@kanru.info) id 1f70c by kanru.info (DragonFly Mail Agent) Fri, 16 Apr 2010 16:12:49 +0800 From: Kan-Ru Chen To: Tomi Valkeinen Cc: Kan-Ru Chen , "linux-omap@vger.kernel.org" , Vaibhav Hiremath , "linux-fbdev@vger.kernel.org" , Thomas Weber Subject: [RFC] [PATCH] Devkit8000: Use generic panel driver instead of new driver for every panel Date: Fri, 16 Apr 2010 16:12:21 +0800 Message-Id: <1271405541-7048-1-git-send-email-kanru@0xlab.org> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1271329417.2690.243.camel@tubuntu.research.nokia.com> References: <1271329417.2690.243.camel@tubuntu.research.nokia.com> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cp20.secserverpros.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - kanru.info X-Source: X-Source-Args: X-Source-Dir: Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 16 Apr 2010 08:14:52 +0000 (UTC) diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c index 5bfc13b..4f52dfd 100644 --- a/arch/arm/mach-omap2/board-devkit8000.c +++ b/arch/arm/mach-omap2/board-devkit8000.c @@ -172,8 +172,9 @@ static struct regulator_consumer_supply devkit8000_vsim_supply = { static struct omap_dss_device devkit8000_lcd_device = { .name = "lcd", - .driver_name = "innolux_at_panel", + .driver_name = "generic_panel", .type = OMAP_DISPLAY_TYPE_DPI, + .panel.config = OMAP_DSS_LCD_TFT|OMAP_DSS_LCD_IVS|OMAP_DSS_LCD_IHS, .phy.dpi.data_lines = 24, .platform_enable = devkit8000_panel_enable_lcd, .platform_disable = devkit8000_panel_disable_lcd, diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c index b895aae..89bb3e5 100644 --- a/drivers/video/modedb.c +++ b/drivers/video/modedb.c @@ -273,6 +273,18 @@ static const struct fb_videomode modedb[] = { /* 800x520i @ 50 Hz, 15.625 kHz hsync (PAL RGB) */ NULL, 50, 800, 520, 58823, 144, 64, 72, 28, 80, 5, 0, FB_VMODE_INTERLACED + }, { + /* 480x272 @ 60 Hz, Devkit8000 4.3 inch LCD */ + NULL, 60, 480, 272, 111000, 2, 2, 2, 2, 41, 10, + 0, FB_VMODE_NONINTERLACED + }, { + /* 640x480 @ 60 Hz, Devkit8000 5.6 inch LCD */ + NULL, 60, 640, 480, 39682, 16, 143, 32, 12, 1, 1, + 0, FB_VMODE_NONINTERLACED + }, { + /* 800x480 @ 60 Hz, Devkit8000 7 inch LCD */ + NULL, 60, 800, 480, 24855, 210, 45, 132, 22, 1, 1, + 0, FB_VMODE_NONINTERLACED }, }; diff --git a/drivers/video/omap2/displays/panel-generic.c b/drivers/video/omap2/displays/panel-generic.c index 300eff5..b0a5599 100644 --- a/drivers/video/omap2/displays/panel-generic.c +++ b/drivers/video/omap2/displays/panel-generic.c @@ -66,7 +66,8 @@ static void generic_panel_power_off(struct omap_dss_device *dssdev) static int generic_panel_probe(struct omap_dss_device *dssdev) { - dssdev->panel.config = OMAP_DSS_LCD_TFT; + if (dssdev->panel.config == 0) + dssdev->panel.config = OMAP_DSS_LCD_TFT; dssdev->panel.timings = generic_panel_timings; return 0;