提交 2001f999 编写于 作者: L Laurent Pinchart 提交者: Mauro Carvalho Chehab

[media] soc_camera: Don't use module names to load I2C modules

With the v4l2_i2c_new_subdev* functions now supporting loading modules
based on modaliases, remove the module names hardcoded in platform data
and pass a NULL module name to those functions.

All corresponding I2C modules have been checked, and all of them include
a module aliases table with names corresponding to what the soc_camera
platform data uses.
Signed-off-by: NLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 cb9bc962
...@@ -311,7 +311,6 @@ static struct soc_camera_link iclink_mt9v022 = { ...@@ -311,7 +311,6 @@ static struct soc_camera_link iclink_mt9v022 = {
.bus_id = 0, /* Must match with the camera ID */ .bus_id = 0, /* Must match with the camera ID */
.board_info = &pcm037_i2c_camera[1], .board_info = &pcm037_i2c_camera[1],
.i2c_adapter_id = 2, .i2c_adapter_id = 2,
.module_name = "mt9v022",
}; };
static struct soc_camera_link iclink_mt9t031 = { static struct soc_camera_link iclink_mt9t031 = {
...@@ -319,7 +318,6 @@ static struct soc_camera_link iclink_mt9t031 = { ...@@ -319,7 +318,6 @@ static struct soc_camera_link iclink_mt9t031 = {
.power = pcm037_camera_power, .power = pcm037_camera_power,
.board_info = &pcm037_i2c_camera[0], .board_info = &pcm037_i2c_camera[0],
.i2c_adapter_id = 2, .i2c_adapter_id = 2,
.module_name = "mt9t031",
}; };
static struct i2c_board_info pcm037_i2c_devices[] = { static struct i2c_board_info pcm037_i2c_devices[] = {
......
...@@ -179,7 +179,6 @@ static struct soc_camera_link base_iclink = { ...@@ -179,7 +179,6 @@ static struct soc_camera_link base_iclink = {
.reset = marxbot_basecam_reset, .reset = marxbot_basecam_reset,
.board_info = &marxbot_i2c_devices[0], .board_info = &marxbot_i2c_devices[0],
.i2c_adapter_id = 0, .i2c_adapter_id = 0,
.module_name = "mt9t031",
}; };
static struct platform_device marxbot_camera[] = { static struct platform_device marxbot_camera[] = {
......
...@@ -88,7 +88,6 @@ static struct soc_camera_link base_iclink = { ...@@ -88,7 +88,6 @@ static struct soc_camera_link base_iclink = {
.reset = smartbot_cam_reset, .reset = smartbot_cam_reset,
.board_info = &smartbot_i2c_devices[0], .board_info = &smartbot_i2c_devices[0],
.i2c_adapter_id = 0, .i2c_adapter_id = 0,
.module_name = "mt9t031",
}; };
static struct platform_device smartbot_camera[] = { static struct platform_device smartbot_camera[] = {
......
...@@ -1015,7 +1015,6 @@ static struct soc_camera_link iclink = { ...@@ -1015,7 +1015,6 @@ static struct soc_camera_link iclink = {
.power = em_x270_sensor_power, .power = em_x270_sensor_power,
.board_info = &em_x270_i2c_cam_info[0], .board_info = &em_x270_i2c_cam_info[0],
.i2c_adapter_id = 0, .i2c_adapter_id = 0,
.module_name = "mt9m111",
}; };
static struct platform_device em_x270_camera = { static struct platform_device em_x270_camera = {
......
...@@ -753,7 +753,6 @@ static struct soc_camera_link a780_iclink = { ...@@ -753,7 +753,6 @@ static struct soc_camera_link a780_iclink = {
.flags = SOCAM_SENSOR_INVERT_PCLK, .flags = SOCAM_SENSOR_INVERT_PCLK,
.i2c_adapter_id = 0, .i2c_adapter_id = 0,
.board_info = &a780_camera_i2c_board_info, .board_info = &a780_camera_i2c_board_info,
.module_name = "mt9m111",
.power = a780_camera_power, .power = a780_camera_power,
.reset = a780_camera_reset, .reset = a780_camera_reset,
}; };
...@@ -1025,7 +1024,6 @@ static struct soc_camera_link a910_iclink = { ...@@ -1025,7 +1024,6 @@ static struct soc_camera_link a910_iclink = {
.bus_id = 0, .bus_id = 0,
.i2c_adapter_id = 0, .i2c_adapter_id = 0,
.board_info = &a910_camera_i2c_board_info, .board_info = &a910_camera_i2c_board_info,
.module_name = "mt9m111",
.power = a910_camera_power, .power = a910_camera_power,
.reset = a910_camera_reset, .reset = a910_camera_reset,
}; };
......
...@@ -711,7 +711,6 @@ static struct soc_camera_link iclink = { ...@@ -711,7 +711,6 @@ static struct soc_camera_link iclink = {
.bus_id = 0, /* Match id in pxa27x_device_camera in device.c */ .bus_id = 0, /* Match id in pxa27x_device_camera in device.c */
.board_info = &mioa701_i2c_devices[0], .board_info = &mioa701_i2c_devices[0],
.i2c_adapter_id = 0, .i2c_adapter_id = 0,
.module_name = "mt9m111",
}; };
struct i2c_pxa_platform_data i2c_pdata = { struct i2c_pxa_platform_data i2c_pdata = {
......
...@@ -453,7 +453,6 @@ static struct soc_camera_link iclink[] = { ...@@ -453,7 +453,6 @@ static struct soc_camera_link iclink[] = {
.query_bus_param = pcm990_camera_query_bus_param, .query_bus_param = pcm990_camera_query_bus_param,
.set_bus_param = pcm990_camera_set_bus_param, .set_bus_param = pcm990_camera_set_bus_param,
.free_bus = pcm990_camera_free_bus, .free_bus = pcm990_camera_free_bus,
.module_name = "mt9v022",
}, { }, {
.bus_id = 0, /* Must match with the camera ID */ .bus_id = 0, /* Must match with the camera ID */
.board_info = &pcm990_camera_i2c[1], .board_info = &pcm990_camera_i2c[1],
...@@ -461,7 +460,6 @@ static struct soc_camera_link iclink[] = { ...@@ -461,7 +460,6 @@ static struct soc_camera_link iclink[] = {
.query_bus_param = pcm990_camera_query_bus_param, .query_bus_param = pcm990_camera_query_bus_param,
.set_bus_param = pcm990_camera_set_bus_param, .set_bus_param = pcm990_camera_set_bus_param,
.free_bus = pcm990_camera_free_bus, .free_bus = pcm990_camera_free_bus,
.module_name = "mt9m001",
}, },
}; };
......
...@@ -481,7 +481,6 @@ static struct soc_camera_link ov7725_link = { ...@@ -481,7 +481,6 @@ static struct soc_camera_link ov7725_link = {
.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,
.module_name = "ov772x",
.priv = &ov7725_info, .priv = &ov7725_info,
}; };
......
...@@ -620,7 +620,6 @@ static struct soc_camera_link tw9910_link = { ...@@ -620,7 +620,6 @@ static struct soc_camera_link tw9910_link = {
.bus_id = 1, .bus_id = 1,
.power = tw9910_power, .power = tw9910_power,
.board_info = &i2c_camera[0], .board_info = &i2c_camera[0],
.module_name = "tw9910",
.priv = &tw9910_info, .priv = &tw9910_info,
}; };
...@@ -644,7 +643,6 @@ static struct soc_camera_link mt9t112_link1 = { ...@@ -644,7 +643,6 @@ static struct soc_camera_link mt9t112_link1 = {
.power = mt9t112_power1, .power = mt9t112_power1,
.bus_id = 0, .bus_id = 0,
.board_info = &i2c_camera[1], .board_info = &i2c_camera[1],
.module_name = "mt9t112",
.priv = &mt9t112_info1, .priv = &mt9t112_info1,
}; };
...@@ -667,7 +665,6 @@ static struct soc_camera_link mt9t112_link2 = { ...@@ -667,7 +665,6 @@ static struct soc_camera_link mt9t112_link2 = {
.power = mt9t112_power2, .power = mt9t112_power2,
.bus_id = 1, .bus_id = 1,
.board_info = &i2c_camera[2], .board_info = &i2c_camera[2],
.module_name = "mt9t112",
.priv = &mt9t112_info2, .priv = &mt9t112_info2,
}; };
......
...@@ -333,7 +333,6 @@ static struct soc_camera_link rj54n1_link = { ...@@ -333,7 +333,6 @@ static struct soc_camera_link rj54n1_link = {
.power = camera_power, .power = camera_power,
.board_info = &kfr2r09_i2c_camera, .board_info = &kfr2r09_i2c_camera,
.i2c_adapter_id = 1, .i2c_adapter_id = 1,
.module_name = "rj54n1cb0c",
.priv = &rj54n1_priv, .priv = &rj54n1_priv,
}; };
......
...@@ -450,7 +450,6 @@ static struct soc_camera_link ov7725_link = { ...@@ -450,7 +450,6 @@ static struct soc_camera_link ov7725_link = {
.power = ov7725_power, .power = ov7725_power,
.board_info = &migor_i2c_camera[0], .board_info = &migor_i2c_camera[0],
.i2c_adapter_id = 0, .i2c_adapter_id = 0,
.module_name = "ov772x",
.priv = &ov7725_info, .priv = &ov7725_info,
}; };
...@@ -463,7 +462,6 @@ static struct soc_camera_link tw9910_link = { ...@@ -463,7 +462,6 @@ static struct soc_camera_link tw9910_link = {
.power = tw9910_power, .power = tw9910_power,
.board_info = &migor_i2c_camera[1], .board_info = &migor_i2c_camera[1],
.i2c_adapter_id = 0, .i2c_adapter_id = 0,
.module_name = "tw9910",
.priv = &tw9910_info, .priv = &tw9910_info,
}; };
......
...@@ -896,7 +896,7 @@ static int soc_camera_init_i2c(struct soc_camera_device *icd, ...@@ -896,7 +896,7 @@ static int soc_camera_init_i2c(struct soc_camera_device *icd,
icl->board_info->platform_data = icd; icl->board_info->platform_data = icd;
subdev = v4l2_i2c_new_subdev_board(&ici->v4l2_dev, adap, subdev = v4l2_i2c_new_subdev_board(&ici->v4l2_dev, adap,
icl->module_name, icl->board_info, NULL); NULL, icl->board_info, NULL);
if (!subdev) if (!subdev)
goto ei2cnd; goto ei2cnd;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册