diff options
Diffstat (limited to 'arch/sh/boards/mach-ecovec24/setup.c')
-rw-r--r-- | arch/sh/boards/mach-ecovec24/setup.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c index 1d7b495a7db..ddc7e4e4d2a 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 | ||
@@ -793,7 +790,6 @@ static struct sh_vou_pdata sh_vou_pdata = { | |||
793 | .flags = SH_VOU_HSYNC_LOW | SH_VOU_VSYNC_LOW, | 790 | .flags = SH_VOU_HSYNC_LOW | SH_VOU_VSYNC_LOW, |
794 | .board_info = &ak8813, | 791 | .board_info = &ak8813, |
795 | .i2c_adap = 0, | 792 | .i2c_adap = 0, |
796 | .module_name = "ak881x", | ||
797 | }; | 793 | }; |
798 | 794 | ||
799 | static struct resource sh_vou_resources[] = { | 795 | static struct resource sh_vou_resources[] = { |
@@ -1248,14 +1244,14 @@ static int __init arch_setup(void) | |||
1248 | 1244 | ||
1249 | /* set SPU2 clock to 83.4 MHz */ | 1245 | /* set SPU2 clock to 83.4 MHz */ |
1250 | clk = clk_get(NULL, "spu_clk"); | 1246 | clk = clk_get(NULL, "spu_clk"); |
1251 | if (clk) { | 1247 | if (!IS_ERR(clk)) { |
1252 | clk_set_rate(clk, clk_round_rate(clk, 83333333)); | 1248 | clk_set_rate(clk, clk_round_rate(clk, 83333333)); |
1253 | clk_put(clk); | 1249 | clk_put(clk); |
1254 | } | 1250 | } |
1255 | 1251 | ||
1256 | /* change parent of FSI B */ | 1252 | /* change parent of FSI B */ |
1257 | clk = clk_get(NULL, "fsib_clk"); | 1253 | clk = clk_get(NULL, "fsib_clk"); |
1258 | if (clk) { | 1254 | if (!IS_ERR(clk)) { |
1259 | clk_register(&fsimckb_clk); | 1255 | clk_register(&fsimckb_clk); |
1260 | clk_set_parent(clk, &fsimckb_clk); | 1256 | clk_set_parent(clk, &fsimckb_clk); |
1261 | clk_set_rate(clk, 11000); | 1257 | clk_set_rate(clk, 11000); |
@@ -1273,7 +1269,7 @@ static int __init arch_setup(void) | |||
1273 | 1269 | ||
1274 | /* set VPU clock to 166 MHz */ | 1270 | /* set VPU clock to 166 MHz */ |
1275 | clk = clk_get(NULL, "vpu_clk"); | 1271 | clk = clk_get(NULL, "vpu_clk"); |
1276 | if (clk) { | 1272 | if (!IS_ERR(clk)) { |
1277 | clk_set_rate(clk, clk_round_rate(clk, 166000000)); | 1273 | clk_set_rate(clk, clk_round_rate(clk, 166000000)); |
1278 | clk_put(clk); | 1274 | clk_put(clk); |
1279 | } | 1275 | } |