From patchwork Fri Jul 29 10:56:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 1019902 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6TAvun3007902 for ; Fri, 29 Jul 2011 10:57:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756411Ab1G2K5r (ORCPT ); Fri, 29 Jul 2011 06:57:47 -0400 Received: from moutng.kundenserver.de ([212.227.126.186]:63266 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756293Ab1G2K5F (ORCPT ); Fri, 29 Jul 2011 06:57:05 -0400 Received: from axis700.grange (dslb-084-061-105-216.pools.arcor-ip.net [84.61.105.216]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0Lb6xp-1RFX8T0pBp-00khD6; Fri, 29 Jul 2011 12:57:04 +0200 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id 6964218B041; Fri, 29 Jul 2011 12:57:02 +0200 (CEST) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1QmkkY-0007ph-9f; Fri, 29 Jul 2011 12:57:02 +0200 From: Guennadi Liakhovetski To: linux-media@vger.kernel.org Cc: Paul Mundt Subject: [PATCH 56/59] ARM: mach-shmobile: mackerel doesn't need legacy SOCAM_* flags anymore Date: Fri, 29 Jul 2011 12:56:56 +0200 Message-Id: <1311937019-29914-57-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1311937019-29914-1-git-send-email-g.liakhovetski@gmx.de> References: <1311937019-29914-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:Xlgk9heAnO59HXQrqNm8qbR8f37c+odl09EEvDr5qwg THo2eSLUiaaaXdLSPKhm/D6XEVIJ6oJa+uNQNX3WLdaDN1WUrc 5bkCDH3cK3lXz6THoNmrgs41KEhmpU1KzvPPQa4YY+GQUbxrHL lf031ha0uKkiWAqP0byMK2bsYj71AcP5lT4lSUTmpA5RSjbiT5 bkjt9MIxQg9QAAW8Fx2cVhaDm0oWqxjeB2CFi3sRWQ= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 29 Jul 2011 10:57:56 +0000 (UTC) The sh_mobile_ceu_camera driver has been converted to use the V4L2 subdevice .[gs]_mbus_config() operations, therefore we don't need SOCAM_* flags for the soc_camera_platform driver anymore. Remove them. Signed-off-by: Guennadi Liakhovetski Cc: Paul Mundt --- arch/arm/mach-shmobile/board-mackerel.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index 409606b..8f1e8fa 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c @@ -1211,9 +1211,6 @@ static struct soc_camera_platform_info camera_info = { .width = 640, .height = 480, }, - .bus_param = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH | - SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8 | - SOCAM_DATA_ACTIVE_HIGH, .mbus_param = V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_MASTER | V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_DATA_ACTIVE_HIGH,