From patchwork Fri Jun 26 18:41:28 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 32599 Received: from bear.ext.ti.com (bear.ext.ti.com [192.94.94.41]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n5QIhouE007216 for ; Fri, 26 Jun 2009 18:43:51 GMT Received: from dlep35.itg.ti.com ([157.170.170.118]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id n5QIfj2W002057; Fri, 26 Jun 2009 13:41:50 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id n5QIfjRM007509; Fri, 26 Jun 2009 13:41:45 -0500 (CDT) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 71D5880627; Fri, 26 Jun 2009 13:41:42 -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 E318E80626 for ; Fri, 26 Jun 2009 13:41:41 -0500 (CDT) Received: from medina.ext.ti.com (localhost [127.0.0.1]) by dflp51.itg.ti.com (8.13.7/8.13.7) with ESMTP id n5QIffMw012669 for ; Fri, 26 Jun 2009 13:41:41 -0500 (CDT) Received: from mail174-tx2-R.bigfish.com (mail-tx2.bigfish.com [65.55.88.114]) by medina.ext.ti.com (8.13.7/8.13.7) with ESMTP id n5QIfaue003509 for ; Fri, 26 Jun 2009 13:41:41 -0500 Received: from mail174-tx2 (localhost.localdomain [127.0.0.1]) by mail174-tx2-R.bigfish.com (Postfix) with ESMTP id EAC67D384F6 for ; Fri, 26 Jun 2009 18:41:35 +0000 (UTC) X-SpamScore: -15 X-BigFish: vps-15(zz1432R1805Mzz1202hzzz2dh6bh62h) X-Spam-TCS-SCL: 1:0 X-FB-SS: 5, X-MS-Exchange-Organization-Antispam-Report: OrigIP: 209.85.219.214; Service: EHS Received: by mail174-tx2 (MessageSwitch) id 1246041694421968_20614; Fri, 26 Jun 2009 18:41:34 +0000 (UCT) Received: from mail-ew0-f214.google.com (mail-ew0-f214.google.com [209.85.219.214]) by mail174-tx2.bigfish.com (Postfix) with ESMTP id 234ED106805C for ; Fri, 26 Jun 2009 18:41:33 +0000 (UTC) Received: by ewy10 with SMTP id 10so2742049ewy.40 for ; Fri, 26 Jun 2009 11:41:33 -0700 (PDT) Received: by 10.210.63.2 with SMTP id l2mr625667eba.34.1246041692974; Fri, 26 Jun 2009 11:41:32 -0700 (PDT) Received: from localhost ([216.254.16.51]) by mx.google.com with ESMTPS id 7sm968919eyg.22.2009.06.26.11.41.30 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 26 Jun 2009 11:41:31 -0700 (PDT) To: Chaithrika U S , hverkuil@xs4all.nl References: <1245666159-30878-1-git-send-email-chaithrika@ti.com> From: Kevin Hilman Organization: Deep Root Systems, LLC Date: Fri, 26 Jun 2009 11:41:28 -0700 In-Reply-To: <1245666159-30878-1-git-send-email-chaithrika@ti.com> (Chaithrika U. S.'s message of "Mon\, 22 Jun 2009 06\:22\:39 -0400") Message-ID: <874ou2et2f.fsf@deeprootsystems.com> User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.2 (gnu/linux) MIME-Version: 1.0 Cc: davinci-linux-open-source@linux.davincidsp.com, linux-media@vger.kernel.org Subject: Re: [PATCH] ARM: DaVinci: DM646x Video: Platform and board specific setup X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.4 Precedence: list List-Id: davinci-linux-open-source.linux.davincidsp.com List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: davinci-linux-open-source-bounces@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com Chaithrika U S writes: > Platform specific display device setup for DM646x EVM > > Add platform device and resource structures. Also define a platform specific > clock setup function that can be accessed by the driver to configure the clock > and CPLD. > > This patch is dependent on a patch submitted earlier, which adds > Pin Mux and clock definitions for Video on DM646x. > > Signed-off-by: Manjunath Hadli > Signed-off-by: Brijesh Jadav > Signed-off-by: Chaithrika U S Hans, go ahead and merge this version of the patch into your tree after folding in the diff below. Then, you can add: Signed-off-by: Kevin Hilman diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index 50dba53..1b5c06d 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -596,7 +596,7 @@ static struct platform_device dm646x_edma_device = { .resource = edma_resources, }; -static u64 vpif_dma_mask = DMA_32BIT_MASK; +static u64 vpif_dma_mask = DMA_BIT_MASK(32); static struct resource vpif_resource[] = {