From patchwork Fri Nov 27 20:31:36 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Ospite X-Patchwork-Id: 2204 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Fri, 27 Nov 2009 20:33:19 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra with IMAP (fetchmail-6.3.6) for (single-drop); Fri, 27 Nov 2009 18:37:34 -0200 (BRST) Received: from vger.kernel.org ([209.132.176.167]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NE7VG-0003Rd-Uq; Fri, 27 Nov 2009 20:33:19 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751306AbZK0UdL (ORCPT + 1 other); Fri, 27 Nov 2009 15:33:11 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751076AbZK0UdL (ORCPT ); Fri, 27 Nov 2009 15:33:11 -0500 Received: from smtp-out113.alice.it ([85.37.17.113]:1570 "EHLO smtp-out113.alice.it" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750696AbZK0UdK (ORCPT ); Fri, 27 Nov 2009 15:33:10 -0500 Received: from FBCMMO04.fbc.local ([192.168.184.135]) by smtp-out113.alice.it with Microsoft SMTPSVC(6.0.3790.3959); Fri, 27 Nov 2009 21:33:15 +0100 Received: from FBCMCL01B04.fbc.local ([192.168.69.85]) by FBCMMO04.fbc.local with Microsoft SMTPSVC(6.0.3790.3959); Fri, 27 Nov 2009 21:32:06 +0100 Received: from badebec ([87.6.149.247]) by FBCMCL01B04.fbc.local with Microsoft SMTPSVC(6.0.3790.3959); Fri, 27 Nov 2009 21:32:05 +0100 Received: by badebec with local (Exim 4.69) (envelope-from ) id 1NE7U0-0004Oy-1J; Fri, 27 Nov 2009 21:32:00 +0100 From: Antonio Ospite To: linux-arm-kernel@lists.infradead.org Cc: Antonio Ospite , Linux Media Mailing List , Eric Miao , Mike Rapoport , Juergen Beisert , Robert Jarzmik Subject: [PATCH 2/3 v2] pcm990-baseboard: don't use pxa_camera init() callback Date: Fri, 27 Nov 2009 21:31:36 +0100 Message-Id: <1259353896-16892-1-git-send-email-ospite@studenti.unina.it> X-Mailer: git-send-email 1.6.5.3 In-Reply-To: References: X-Face: z*RaLf`X<@C75u6Ig9}{oW$H; 1_\2t5)({*|jhM/Vb; ]yA5\I~93>J<_`<4)A{':UrE X-OriginalArrivalTime: 27 Nov 2009 20:32:05.0285 (UTC) FILETIME=[AEE00D50:01CA6FA0] Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org pxa_camera init() is ambiguous, it's better to configure PXA CIF pins statically in machine init function. Signed-off-by: Antonio Ospite --- The only change from previous version is the commit message, we don't want to mention .init() removal yet. arch/arm/mach-pxa/pcm990-baseboard.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c index bbda570..d5255ae 100644 --- a/arch/arm/mach-pxa/pcm990-baseboard.c +++ b/arch/arm/mach-pxa/pcm990-baseboard.c @@ -359,19 +359,12 @@ static unsigned long pcm990_camera_pin_config[] = { GPIO44_CIF_LV, }; -static int pcm990_pxacamera_init(struct device *dev) -{ - pxa2xx_mfp_config(ARRAY_AND_SIZE(pcm990_camera_pin_config)); - return 0; -} - /* * CICR4: PCLK_EN: Pixel clock is supplied by the sensor * MCLK_EN: Master clock is generated by PXA * PCP: Data sampled on the falling edge of pixel clock */ struct pxacamera_platform_data pcm990_pxacamera_platform_data = { - .init = pcm990_pxacamera_init, .flags = PXA_CAMERA_MASTER | PXA_CAMERA_DATAWIDTH_8 | PXA_CAMERA_DATAWIDTH_10 | PXA_CAMERA_PCLK_EN | PXA_CAMERA_MCLK_EN/* | PXA_CAMERA_PCP*/, .mclk_10khz = 1000, @@ -532,6 +525,7 @@ void __init pcm990_baseboard_init(void) pxa_set_ac97_info(NULL); #if defined(CONFIG_VIDEO_PXA27x) || defined(CONFIG_VIDEO_PXA27x_MODULE) + pxa2xx_mfp_config(ARRAY_AND_SIZE(pcm990_camera_pin_config)); pxa_set_camera_info(&pcm990_pxacamera_platform_data); i2c_register_board_info(0, ARRAY_AND_SIZE(pcm990_i2c_devices));