Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2001f999 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent cb9bc962

arch/arm/mach-mx3/mach-pcm037.c

+0 −2
Original line number Diff line number Diff line
@@ -311,7 +311,6 @@ static struct soc_camera_link iclink_mt9v022 = { 
	.bus_id		= 0,		/* Must match with the camera ID */

	.board_info	= &pcm037_i2c_camera[1],

	.i2c_adapter_id	= 2,

	.module_name	= "mt9v022",

};



static struct soc_camera_link iclink_mt9t031 = {
@@ -319,7 +318,6 @@ static struct soc_camera_link iclink_mt9t031 = { 
	.power		= pcm037_camera_power,

	.board_info	= &pcm037_i2c_camera[0],

	.i2c_adapter_id	= 2,

	.module_name	= "mt9t031",

};



static struct i2c_board_info pcm037_i2c_devices[] = {

arch/arm/mach-mx3/mx31moboard-marxbot.c

+0 −1
Original line number Diff line number Diff line
@@ -179,7 +179,6 @@ static struct soc_camera_link base_iclink = { 
	.reset		= marxbot_basecam_reset,

	.board_info	= &marxbot_i2c_devices[0],

	.i2c_adapter_id	= 0,

	.module_name	= "mt9t031",

};



static struct platform_device marxbot_camera[] = {

arch/arm/mach-mx3/mx31moboard-smartbot.c

+0 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ static struct soc_camera_link base_iclink = { 
	.reset		= smartbot_cam_reset,

	.board_info	= &smartbot_i2c_devices[0],

	.i2c_adapter_id	= 0,

	.module_name	= "mt9t031",

};



static struct platform_device smartbot_camera[] = {

arch/arm/mach-pxa/em-x270.c

+0 −1
Original line number Diff line number Diff line
@@ -1015,7 +1015,6 @@ static struct soc_camera_link iclink = { 
	.power		= em_x270_sensor_power,

	.board_info	= &em_x270_i2c_cam_info[0],

	.i2c_adapter_id	= 0,

	.module_name	= "mt9m111",

};



static struct platform_device em_x270_camera = {

arch/arm/mach-pxa/ezx.c

+0 −2
Original line number Diff line number Diff line
@@ -753,7 +753,6 @@ static struct soc_camera_link a780_iclink = { 
	.flags          = SOCAM_SENSOR_INVERT_PCLK,

	.i2c_adapter_id = 0,

	.board_info     = &a780_camera_i2c_board_info,

	.module_name    = "mt9m111",

	.power          = a780_camera_power,

	.reset          = a780_camera_reset,

};
@@ -1025,7 +1024,6 @@ static struct soc_camera_link a910_iclink = { 
	.bus_id         = 0,

	.i2c_adapter_id = 0,

	.board_info     = &a910_camera_i2c_board_info,

	.module_name    = "mt9m111",

	.power          = a910_camera_power,

	.reset          = a910_camera_reset,

};