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: "Lad, Prabhakar" X-Patchwork-Id: 2484181 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork1.kernel.org (Postfix) with ESMTP id 3532B3FCA5 for ; Wed, 24 Apr 2013 12:02:43 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UUyOW-00034w-0R; Wed, 24 Apr 2013 12:01:53 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UUyOA-0007ns-Vy; Wed, 24 Apr 2013 12:01:31 +0000 Received: from mail-pd0-f179.google.com ([209.85.192.179]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UUyO7-0007nK-La for linux-arm-kernel@lists.infradead.org; Wed, 24 Apr 2013 12:01:28 +0000 Received: by mail-pd0-f179.google.com with SMTP id x11so1084415pdj.38 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130424_080127_815395_2168DD07 X-CRM114-Status: GOOD ( 14.22 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.192.179 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (prabhakar.csengg[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: "Lad, Prabhakar" , Florian Tobias Schandinat , Sekhar Nori , LKML , Mauro Carvalho Chehab X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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;