aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2010-09-24 08:27:03 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-22 19:53:52 -0400
commit2001f99947017e378e55943a350c67a8fca9e9b6 (patch)
tree6ebe40a702465ba78ca7b9c46a88fcd66dfa2e09 /arch/sh
parentcb9bc962a10144d3a70651f1f5c755b34d8d5bf4 (diff)
[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: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/boards/mach-ap325rxa/setup.c1
-rw-r--r--arch/sh/boards/mach-ecovec24/setup.c3
-rw-r--r--arch/sh/boards/mach-kfr2r09/setup.c1
-rw-r--r--arch/sh/boards/mach-migor/setup.c2
4 files changed, 0 insertions, 7 deletions
diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c
index 3da116f47f01..881a3a5f5647 100644
--- a/arch/sh/boards/mach-ap325rxa/setup.c
+++ b/arch/sh/boards/mach-ap325rxa/setup.c
@@ -481,7 +481,6 @@ static struct soc_camera_link ov7725_link = {
481 .power = ov7725_power, 481 .power = ov7725_power,
482 .board_info = &ap325rxa_i2c_camera[0], 482 .board_info = &ap325rxa_i2c_camera[0],
483 .i2c_adapter_id = 0, 483 .i2c_adapter_id = 0,
484 .module_name = "ov772x",
485 .priv = &ov7725_info, 484 .priv = &ov7725_info,
486}; 485};
487 486
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 4a9fa5d38540..ae0b13822849 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -620,7 +620,6 @@ static struct soc_camera_link tw9910_link = {
620 .bus_id = 1, 620 .bus_id = 1,
621 .power = tw9910_power, 621 .power = tw9910_power,
622 .board_info = &i2c_camera[0], 622 .board_info = &i2c_camera[0],
623 .module_name = "tw9910",
624 .priv = &tw9910_info, 623 .priv = &tw9910_info,
625}; 624};
626 625
@@ -644,7 +643,6 @@ static struct soc_camera_link mt9t112_link1 = {
644 .power = mt9t112_power1, 643 .power = mt9t112_power1,
645 .bus_id = 0, 644 .bus_id = 0,
646 .board_info = &i2c_camera[1], 645 .board_info = &i2c_camera[1],
647 .module_name = "mt9t112",
648 .priv = &mt9t112_info1, 646 .priv = &mt9t112_info1,
649}; 647};
650 648
@@ -667,7 +665,6 @@ static struct soc_camera_link mt9t112_link2 = {
667 .power = mt9t112_power2, 665 .power = mt9t112_power2,
668 .bus_id = 1, 666 .bus_id = 1,
669 .board_info = &i2c_camera[2], 667 .board_info = &i2c_camera[2],
670 .module_name = "mt9t112",
671 .priv = &mt9t112_info2, 668 .priv = &mt9t112_info2,
672}; 669};
673 670
diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c
index 68994a163f6c..1742849db648 100644
--- a/arch/sh/boards/mach-kfr2r09/setup.c
+++ b/arch/sh/boards/mach-kfr2r09/setup.c
@@ -333,7 +333,6 @@ static struct soc_camera_link rj54n1_link = {
333 .power = camera_power, 333 .power = camera_power,
334 .board_info = &kfr2r09_i2c_camera, 334 .board_info = &kfr2r09_i2c_camera,
335 .i2c_adapter_id = 1, 335 .i2c_adapter_id = 1,
336 .module_name = "rj54n1cb0c",
337 .priv = &rj54n1_priv, 336 .priv = &rj54n1_priv,
338}; 337};
339 338
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index 662debe4ead2..03af84842559 100644
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -450,7 +450,6 @@ static struct soc_camera_link ov7725_link = {
450 .power = ov7725_power, 450 .power = ov7725_power,
451 .board_info = &migor_i2c_camera[0], 451 .board_info = &migor_i2c_camera[0],
452 .i2c_adapter_id = 0, 452 .i2c_adapter_id = 0,
453 .module_name = "ov772x",
454 .priv = &ov7725_info, 453 .priv = &ov7725_info,
455}; 454};
456 455
@@ -463,7 +462,6 @@ static struct soc_camera_link tw9910_link = {
463 .power = tw9910_power, 462 .power = tw9910_power,
464 .board_info = &migor_i2c_camera[1], 463 .board_info = &migor_i2c_camera[1],
465 .i2c_adapter_id = 0, 464 .i2c_adapter_id = 0,
466 .module_name = "tw9910",
467 .priv = &tw9910_info, 465 .priv = &tw9910_info,
468}; 466};
469 467