From patchwork Wed Apr 24 12:00:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prabhakar X-Patchwork-Id: 2484271 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from devils.ext.ti.com (devils.ext.ti.com [198.47.26.153]) by patchwork2.kernel.org (Postfix) with ESMTP id 70945DF25A for ; Wed, 24 Apr 2013 12:06:49 +0000 (UTC) Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id r3OC3fKS031564; Wed, 24 Apr 2013 07:03:42 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id r3OC3ftV015335; Wed, 24 Apr 2013 07:03:41 -0500 Received: from dlelxv23.itg.ti.com (172.17.1.198) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.2.342.3; Wed, 24 Apr 2013 07:03:41 -0500 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dlelxv23.itg.ti.com (8.13.8/8.13.8) with ESMTP id r3OC3fKI012239; Wed, 24 Apr 2013 07:03:41 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 71C3880627; Wed, 24 Apr 2013 07:03:41 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp51.itg.ti.com (dflp51.itg.ti.com [128.247.22.94]) by linux.omap.com (Postfix) with ESMTP id 001458062B for ; Wed, 24 Apr 2013 07:01:28 -0500 (CDT) Received: from medina.ext.ti.com (medina.ext.ti.com [192.91.81.31]) by dflp51.itg.ti.com (8.13.7/8.13.8) with ESMTP id r3OC1S1F021442 for ; Wed, 24 Apr 2013 07:01:28 -0500 (CDT) Received: from mail6.bemta8.messagelabs.com (mail6.bemta8.messagelabs.com [216.82.243.55]) by medina.ext.ti.com (8.13.7/8.13.7) with ESMTP id r3OC1Skl031790 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 24 Apr 2013 07:01:28 -0500 Received: from [216.82.242.131:8217] by server-11.bemta-8.messagelabs.com id C8/9B-14229-899C7715; Wed, 24 Apr 2013 12:01:28 +0000 X-Env-Sender: prabhakar.csengg@gmail.com X-Msg-Ref: server-3.tower-76.messagelabs.com!1366804886!24298616!1 X-Originating-IP: [209.85.192.178] X-SpamReason: No, hits=0.0 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, spamassassin: X-StarScan-Received: X-StarScan-Version: 6.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20637 invoked from network); 24 Apr 2013 12:01:27 -0000 Received: from mail-pd0-f178.google.com (HELO mail-pd0-f178.google.com) (209.85.192.178) by server-3.tower-76.messagelabs.com with RC4-SHA encrypted SMTP; 24 Apr 2013 12:01:27 -0000 Received: by mail-pd0-f178.google.com with SMTP id w10so560696pde.23 for ; Wed, 24 Apr 2013 05:01:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=ZT+jitAoGKmodP9eqx2v2jpg/5XEMyP9YhzuumTmUts=; b=RiV+MNV8LXjmbEU7GyLvMLE+IXpQmYBa+RWNlOwqcl62Afd5bTtgYCAJQHfFn6l/K8 lPWpNxehT+8FySqkEUOBGwmDH8NETOv9qN84OW0u69UoAw1MxqdwQJPrrSl93bzygJ10 PmVhkBkSEUzLPnElTNV8mb84nx7H0uHqxKbYWjVb+AUvbFFmwl0lj1e+ZxDaAWvuwx1+ m0LSa46wjuml5zhitN42N87Ii+Adi0sq05BVJdCwzMyyQg5C79FeXG2ObKtzB4oDLNpk 3XEGHjSOk5+uiJYd8abK0RI2/+1FXZoG5lK+l0CeYEpzQiuvZg8H6TpQQgBiWPtUI7Lr NDTw== X-Received: by 10.68.178.37 with SMTP id cv5mr46078102pbc.213.1366804886096; Wed, 24 Apr 2013 05:01:26 -0700 (PDT) Received: from localhost.localdomain ([122.166.13.141]) by mx.google.com with ESMTPSA id 9sm2772915pbi.45.2013.04.24.05.01.21 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 24 Apr 2013 05:01:25 -0700 (PDT) From: Prabhakar Lad To: DLOS , LMML , LFBDEV , LAK Subject: [PATCH 4/6] ARM: davinci: dm355: enable fbdev driver Date: Wed, 24 Apr 2013 17:30:06 +0530 Message-ID: <1366804808-22720-5-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1366804808-22720-1-git-send-email-prabhakar.csengg@gmail.com> References: <1366804808-22720-1-git-send-email-prabhakar.csengg@gmail.com> CC: Florian Tobias Schandinat , LKML , Mauro Carvalho Chehab X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com From: Lad, Prabhakar This patch enables fbdev driver by creating fbdev device and register it. Alongside renames 'vpfe_capture_dma_mask' to 'dm355_video_dma_mask' for better clarity since it was reused by capture and diplay aswell. Signed-off-by: Lad, Prabhakar --- arch/arm/mach-davinci/dm355.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index bf9a9d4..fe50814 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c @@ -714,7 +714,7 @@ static struct resource vpfe_resources[] = { }, }; -static u64 vpfe_capture_dma_mask = DMA_BIT_MASK(32); +static u64 dm355_video_dma_mask = DMA_BIT_MASK(32); static struct resource dm355_ccdc_resource[] = { /* CCDC Base address */ { @@ -729,7 +729,7 @@ static struct platform_device dm355_ccdc_dev = { .num_resources = ARRAY_SIZE(dm355_ccdc_resource), .resource = dm355_ccdc_resource, .dev = { - .dma_mask = &vpfe_capture_dma_mask, + .dma_mask = &dm355_video_dma_mask, .coherent_dma_mask = DMA_BIT_MASK(32), .platform_data = dm355_ccdc_setup_pinmux, }, @@ -741,7 +741,7 @@ static struct platform_device vpfe_capture_dev = { .num_resources = ARRAY_SIZE(vpfe_resources), .resource = vpfe_resources, .dev = { - .dma_mask = &vpfe_capture_dma_mask, + .dma_mask = &dm355_video_dma_mask, .coherent_dma_mask = DMA_BIT_MASK(32), }, }; @@ -760,7 +760,7 @@ static struct platform_device dm355_osd_dev = { .num_resources = ARRAY_SIZE(dm355_osd_resources), .resource = dm355_osd_resources, .dev = { - .dma_mask = &vpfe_capture_dma_mask, + .dma_mask = &dm355_video_dma_mask, .coherent_dma_mask = DMA_BIT_MASK(32), }, }; @@ -855,7 +855,16 @@ static struct platform_device dm355_vpbe_display = { .num_resources = ARRAY_SIZE(dm355_v4l2_disp_resources), .resource = dm355_v4l2_disp_resources, .dev = { - .dma_mask = &vpfe_capture_dma_mask, + .dma_mask = &dm355_video_dma_mask, + .coherent_dma_mask = DMA_BIT_MASK(32), + }, +}; + +static struct platform_device dm355_davincifb = { + .name = "davinci-vpbe-fb", + .id = -1, + .dev = { + .dma_mask = &dm355_video_dma_mask, .coherent_dma_mask = DMA_BIT_MASK(32), }, }; @@ -871,7 +880,7 @@ static struct platform_device dm355_venc_dev = { .num_resources = ARRAY_SIZE(dm355_venc_resources), .resource = dm355_venc_resources, .dev = { - .dma_mask = &vpfe_capture_dma_mask, + .dma_mask = &dm355_video_dma_mask, .coherent_dma_mask = DMA_BIT_MASK(32), .platform_data = (void *)&dm355_venc_pdata, }, @@ -881,7 +890,7 @@ static struct platform_device dm355_vpbe_dev = { .name = "vpbe_controller", .id = -1, .dev = { - .dma_mask = &vpfe_capture_dma_mask, + .dma_mask = &dm355_video_dma_mask, .coherent_dma_mask = DMA_BIT_MASK(32), }, }; @@ -1023,6 +1032,7 @@ int __init dm355_init_video(struct vpfe_config *vpfe_cfg, platform_device_register(&dm355_venc_dev); platform_device_register(&dm355_vpbe_dev); platform_device_register(&dm355_vpbe_display); + platform_device_register(&dm355_davincifb); } return 0;