提交 83fe78ea 编写于 作者: G Guennadi Liakhovetski 提交者: Mauro Carvalho Chehab

V4L/DVB (12507): sh: soc-camera updates

Update ap325rxa to specify .bus_id in struct soc_camera_link explicitly, remove
unused .iface from struct soc_camera_platform_info.
Signed-off-by: NGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: NPaul Mundt <lethal@linux-sh.org>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 40e2e092
...@@ -314,7 +314,6 @@ static int ap325rxa_camera_add(struct soc_camera_link *icl, struct device *dev); ...@@ -314,7 +314,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 void ap325rxa_camera_del(struct soc_camera_link *icl);
static struct soc_camera_platform_info camera_info = { static struct soc_camera_platform_info camera_info = {
.iface = 0,
.format_name = "UYVY", .format_name = "UYVY",
.format_depth = 16, .format_depth = 16,
.format = { .format = {
...@@ -327,6 +326,7 @@ static struct soc_camera_platform_info camera_info = { ...@@ -327,6 +326,7 @@ static struct soc_camera_platform_info camera_info = {
SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8, SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8,
.set_capture = camera_set_capture, .set_capture = camera_set_capture,
.link = { .link = {
.bus_id = 0,
.add_device = ap325rxa_camera_add, .add_device = ap325rxa_camera_add,
.del_device = ap325rxa_camera_del, .del_device = ap325rxa_camera_del,
}, },
...@@ -430,6 +430,7 @@ static struct ov772x_camera_info ov7725_info = { ...@@ -430,6 +430,7 @@ static struct ov772x_camera_info ov7725_info = {
.flags = OV772X_FLAG_VFLIP | OV772X_FLAG_HFLIP, .flags = OV772X_FLAG_VFLIP | OV772X_FLAG_HFLIP,
.edgectrl = OV772X_AUTO_EDGECTRL(0xf, 0), .edgectrl = OV772X_AUTO_EDGECTRL(0xf, 0),
.link = { .link = {
.bus_id = 0,
.power = ov7725_power, .power = ov7725_power,
.board_info = &ap325rxa_i2c_camera[0], .board_info = &ap325rxa_i2c_camera[0],
.i2c_adapter_id = 0, .i2c_adapter_id = 0,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册