From patchwork Tue Nov 17 22:04:22 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Ospite X-Patchwork-Id: 60794 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nAHMD9me022684 for ; Tue, 17 Nov 2009 22:13:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755793AbZKQWMN (ORCPT ); Tue, 17 Nov 2009 17:12:13 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755738AbZKQWMN (ORCPT ); Tue, 17 Nov 2009 17:12:13 -0500 Received: from smtp-out13.alice.it ([85.33.2.18]:2299 "EHLO smtp-out13.alice.it" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755427AbZKQWML (ORCPT ); Tue, 17 Nov 2009 17:12:11 -0500 Received: from FBCMMO03.fbc.local ([192.168.68.197]) by smtp-out13.alice.it with Microsoft SMTPSVC(6.0.3790.3959); Tue, 17 Nov 2009 23:12:17 +0100 Received: from FBCMCL01B07.fbc.local ([192.168.171.45]) by FBCMMO03.fbc.local with Microsoft SMTPSVC(6.0.3790.3959); Tue, 17 Nov 2009 23:12:17 +0100 Received: from badebec ([79.2.139.137]) by FBCMCL01B07.fbc.local with Microsoft SMTPSVC(6.0.3790.3959); Tue, 17 Nov 2009 23:04:52 +0100 Received: by badebec with local (Exim 4.69) (envelope-from ) id 1NAWAD-0006mT-9w; Tue, 17 Nov 2009 23:04:41 +0100 From: Antonio Ospite To: linux-media@vger.kernel.org Cc: Antonio Ospite , Guennadi Liakhovetski , Eric Miao , linux-arm-kernel@lists.infradead.org, Mike Rapoport , Juergen Beisert , Robert Jarzmik Subject: [PATCH 2/3] pcm990-baseboard: don't use pxa_camera init() callback Date: Tue, 17 Nov 2009 23:04:22 +0100 Message-Id: <1258495463-26029-3-git-send-email-ospite@studenti.unina.it> X-Mailer: git-send-email 1.6.5.2 In-Reply-To: <1258495463-26029-1-git-send-email-ospite@studenti.unina.it> References: <1258495463-26029-1-git-send-email-ospite@studenti.unina.it> X-OriginalArrivalTime: 17 Nov 2009 22:04:52.0556 (UTC) FILETIME=[FD18B0C0:01CA67D1] Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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));