From patchwork Tue Jan 22 16:53:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Afzal Mohammed X-Patchwork-Id: 2019661 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 8C8083FD1A for ; Tue, 22 Jan 2013 16:54:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755529Ab3AVQx3 (ORCPT ); Tue, 22 Jan 2013 11:53:29 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:54993 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755499Ab3AVQxR (ORCPT ); Tue, 22 Jan 2013 11:53:17 -0500 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id r0MGr6Rg020828; Tue, 22 Jan 2013 10:53:07 -0600 Received: from DBDE71.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id r0MGr6pc010116; Tue, 22 Jan 2013 22:23:06 +0530 (IST) Received: from dbdp32.itg.ti.com (172.24.170.251) by DBDE71.ent.ti.com (172.24.170.149) with Microsoft SMTP Server id 14.1.323.3; Tue, 22 Jan 2013 22:23:05 +0530 Received: from psplinux063.india.ti.com (dbdp20.itg.ti.com [172.24.170.38]) by dbdp32.itg.ti.com (8.13.8/8.13.8) with ESMTP id r0MGr5s7005374; Tue, 22 Jan 2013 22:23:05 +0530 From: Afzal Mohammed To: , , CC: Florian Tobias Schandinat , Tomi Valkeinen , Grant Likely , Rob Herring , Rob Landley , Steffen Trumtrar , Mike Turquette Subject: [PATCH v3 11/12] video: da8xx-fb: setup struct lcd_ctrl_config for dt Date: Tue, 22 Jan 2013 22:23:05 +0530 Message-ID: X-Mailer: git-send-email 1.7.12 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 1c1a616..5455682 100644 --- a/drivers/video/da8xx-fb.c +++ b/drivers/video/da8xx-fb.c @@ -1254,6 +1254,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; @@ -1345,7 +1374,10 @@ static int 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;