diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-08-25 16:34:17 +0200 |
|---|---|---|
| committer | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-08-25 16:34:17 +0200 |
| commit | 2aeb5cc72300a33143580c17b6340a2bd7fc04cb (patch) | |
| tree | e6c31ea648a1e5a1aa145774c931c23326b0ac81 /linux/arch/sh/boards | |
| parent | 0326f126a4d2f1e2cda2c11725a7f7d7d8273f7f (diff) | |
| download | mediapointer-dvb-s2-2aeb5cc72300a33143580c17b6340a2bd7fc04cb.tar.gz mediapointer-dvb-s2-2aeb5cc72300a33143580c17b6340a2bd7fc04cb.tar.bz2 | |
sh: soc-camera updates
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
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 <g.liakhovetski@gmx.de>
Cc: Paul Mundt <lethal@linux-sh.org>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Priority: low
---
arch/sh/boards/board-ap325rxa.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
Diffstat (limited to 'linux/arch/sh/boards')
| -rw-r--r-- | linux/arch/sh/boards/board-ap325rxa.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/arch/sh/boards/board-ap325rxa.c b/linux/arch/sh/boards/board-ap325rxa.c index 4fe0ed3f5..2a5dded5c 100644 --- a/linux/arch/sh/boards/board-ap325rxa.c +++ b/linux/arch/sh/boards/board-ap325rxa.c @@ -311,7 +311,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 = { @@ -324,6 +323,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, }, @@ -424,6 +424,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, |