From patchwork Mon Jan 7 05:11:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Afzal Mohammed X-Patchwork-Id: 1939381 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 874213FED4 for ; Mon, 7 Jan 2013 05:11:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751675Ab3AGFLJ (ORCPT ); Mon, 7 Jan 2013 00:11:09 -0500 Received: from devils.ext.ti.com ([198.47.26.153]:60685 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751292Ab3AGFLG (ORCPT ); Mon, 7 Jan 2013 00:11:06 -0500 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id r075AuqI014617; Sun, 6 Jan 2013 23:10:56 -0600 Received: from DBDE70.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id r075At4i023942; Mon, 7 Jan 2013 10:40:55 +0530 (IST) Received: from dbdp32.itg.ti.com (172.24.170.251) by dbde70.ent.ti.com (172.24.170.148) with Microsoft SMTP Server id 14.1.323.3; Mon, 7 Jan 2013 10:40:55 +0530 Received: from ucmsshproxy.india.ext.ti.com (dbdp20.itg.ti.com [172.24.170.38]) by dbdp32.itg.ti.com (8.13.8/8.13.8) with SMTP id r075AtCM027593; Mon, 7 Jan 2013 10:40:55 +0530 Received: from symphony.india.ext.ti.com (unknown [192.168.247.13]) by ucmsshproxy.india.ext.ti.com (Postfix) with ESMTP id F227F158005; Mon, 7 Jan 2013 10:40:54 +0530 (IST) Received: from ubuntu-psp-linux.india.ext.ti.com (ubuntu-psp-linux [192.168.247.46]) by symphony.india.ext.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id r075AsR24500; Mon, 7 Jan 2013 10:40:54 +0530 (IST) From: Afzal Mohammed To: Florian Tobias Schandinat , Tomi Valkeinen , Grant Likely , Rob Herring , Rob Landley , Steffen Trumtrar , Sekhar Nori , Vaibhav Hiremath , , , , , Subject: [PATCH 10/10] video: da8xx-fb: setup struct lcd_ctrl_config for dt Date: Mon, 7 Jan 2013 10:41:49 +0530 Message-ID: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org strcut lcd_ctrl_config information required for driver is currently obtained via platform data. To handle DT probing, create lcd_ctrl_config and populate it with default values, these values are sufficient for the panels so far used with this controller to work. Signed-off-by: Afzal Mohammed --- drivers/video/da8xx-fb.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c index 3e590d4..4a4b4dc 100644 --- a/drivers/video/da8xx-fb.c +++ b/drivers/video/da8xx-fb.c @@ -1257,6 +1257,35 @@ static struct fb_ops da8xx_fb_ops = { .fb_blank = cfb_blank, }; +static struct lcd_ctrl_config *da8xx_fb_create_cfg(struct platform_device *dev) +{ + struct lcd_ctrl_config *cfg; + + cfg = devm_kzalloc(&dev->dev, sizeof(struct fb_videomode), GFP_KERNEL); + if (!cfg) { + dev_err(&dev->dev, "memory allocation failed\n"); + return NULL; + } + + /* default values */ + + if (lcd_revision == LCD_VERSION_1) + cfg->bpp = 16; + else + cfg->bpp = 32; + + /* + * For panels so far used with this LCDC, below statement is sufficient. + * For new panels, if required, struct lcd_ctrl_cfg fields to be updated + * with additional/modified values. Those values would have to be then + * obtained from dt(requiring new dt bindings). + */ + + cfg->panel_shade = COLOR_ACTIVE; + + return cfg; +} + static struct fb_videomode *da8xx_fb_get_videomode(struct platform_device *dev) { struct da8xx_lcdc_platform_data *fb_pdata = dev->dev.platform_data; @@ -1348,7 +1377,10 @@ static int __devinit fb_probe(struct platform_device *device) break; } - lcd_cfg = (struct lcd_ctrl_config *)fb_pdata->controller_data; + if (device->dev.of_node) + lcd_cfg = da8xx_fb_create_cfg(device); + else + lcd_cfg = (struct lcd_ctrl_config *)fb_pdata->controller_data; if (!lcd_cfg) { ret = -EINVAL;