From patchwork Fri May 15 17:19:43 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 24137 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 n4FHIkih031122 for ; Fri, 15 May 2009 17:19:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754010AbZEORTc (ORCPT ); Fri, 15 May 2009 13:19:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754270AbZEORTc (ORCPT ); Fri, 15 May 2009 13:19:32 -0400 Received: from mail.gmx.net ([213.165.64.20]:49101 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1754010AbZEORTa (ORCPT ); Fri, 15 May 2009 13:19:30 -0400 Received: (qmail invoked by alias); 15 May 2009 17:19:30 -0000 Received: from p57BD0961.dip0.t-ipconnect.de (EHLO axis700.grange) [87.189.9.97] by mail.gmx.net (mp063) with SMTP; 15 May 2009 19:19:30 +0200 X-Authenticated: #20450766 X-Provags-ID: V01U2FsdGVkX1/M09ZB6SvMKx0VQHi2baSU7xjDUv3Io/7OYkXjvP OcaF3TOb+olJ4/ Received: from lyakh (helo=localhost) by axis700.grange with local-esmtp (Exim 4.63) (envelope-from ) id 1M514R-0002ZM-W8; Fri, 15 May 2009 19:19:44 +0200 Date: Fri, 15 May 2009 19:19:43 +0200 (CEST) From: Guennadi Liakhovetski To: Linux Media Mailing List cc: Hans Verkuil , Magnus Damm , Robert Jarzmik , Darius Augulis , Paul Mundt Subject: [PATCH 05/10 v2] sh: soc-camera updates In-Reply-To: Message-ID: References: MIME-Version: 1.0 X-Y-GMX-Trusted: 0 X-FuHaFi: 0.45 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Update ap325rxa to specify .bus_id in struct soc_camera_link explicitly, remove unused .iface from struct soc_camera_platform_info. Signed-off-by: Guennadi Liakhovetski --- Paul, you certainly could take this one, as well as a couple others, but maybe easier to push them all together. arch/sh/boards/board-ap325rxa.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/sh/boards/board-ap325rxa.c b/arch/sh/boards/board-ap325rxa.c index ac964e4..f644ad7 100644 --- a/arch/sh/boards/board-ap325rxa.c +++ b/arch/sh/boards/board-ap325rxa.c @@ -308,7 +308,6 @@ static int ap325rxa_camera_add(struct soc_camera_link *icl, struct device *dev); static void ap325rxa_camera_del(struct soc_camera_link *icl); static struct soc_camera_platform_info camera_info = { - .iface = 0, .format_name = "UYVY", .format_depth = 16, .format = { @@ -321,6 +320,7 @@ static struct soc_camera_platform_info camera_info = { SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8, .set_capture = camera_set_capture, .link = { + .bus_id = 0, .add_device = ap325rxa_camera_add, .del_device = ap325rxa_camera_del, }, @@ -421,6 +421,7 @@ static struct ov772x_camera_info ov7725_info = { .flags = OV772X_FLAG_VFLIP | OV772X_FLAG_HFLIP, .edgectrl = OV772X_AUTO_EDGECTRL(0xf, 0), .link = { + .bus_id = 0, .power = ov7725_power, .board_info = &ap325rxa_i2c_camera[0], .i2c_adapter_id = 0,