diff options
-rw-r--r-- | arch/sh/boards/mach-ap325rxa/setup.c | 4 | ||||
-rw-r--r-- | arch/sh/boards/mach-migor/setup.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c index 7fa74462bd9f..9c71603d29a2 100644 --- a/arch/sh/boards/mach-ap325rxa/setup.c +++ b/arch/sh/boards/mach-ap325rxa/setup.c | |||
@@ -165,6 +165,7 @@ static struct platform_device lcdc_device = { | |||
165 | }, | 165 | }, |
166 | }; | 166 | }; |
167 | 167 | ||
168 | #ifdef CONFIG_I2C | ||
168 | static unsigned char camera_ncm03j_magic[] = | 169 | static unsigned char camera_ncm03j_magic[] = |
169 | { | 170 | { |
170 | 0x87, 0x00, 0x88, 0x08, 0x89, 0x01, 0x8A, 0xE8, | 171 | 0x87, 0x00, 0x88, 0x08, 0x89, 0x01, 0x8A, 0xE8, |
@@ -234,6 +235,7 @@ static struct platform_device camera_device = { | |||
234 | .platform_data = &camera_info, | 235 | .platform_data = &camera_info, |
235 | }, | 236 | }, |
236 | }; | 237 | }; |
238 | #endif /* CONFIG_I2C */ | ||
237 | 239 | ||
238 | static struct sh_mobile_ceu_info sh_mobile_ceu_info = { | 240 | static struct sh_mobile_ceu_info sh_mobile_ceu_info = { |
239 | .flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH | | 241 | .flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH | |
@@ -270,7 +272,9 @@ static struct platform_device *ap325rxa_devices[] __initdata = { | |||
270 | &ap325rxa_nor_flash_device, | 272 | &ap325rxa_nor_flash_device, |
271 | &lcdc_device, | 273 | &lcdc_device, |
272 | &ceu_device, | 274 | &ceu_device, |
275 | #ifdef CONFIG_I2C | ||
273 | &camera_device, | 276 | &camera_device, |
277 | #endif | ||
274 | }; | 278 | }; |
275 | 279 | ||
276 | static struct i2c_board_info __initdata ap325rxa_i2c_devices[] = { | 280 | static struct i2c_board_info __initdata ap325rxa_i2c_devices[] = { |
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c index 7bd365ad2d06..e499ee384d58 100644 --- a/arch/sh/boards/mach-migor/setup.c +++ b/arch/sh/boards/mach-migor/setup.c | |||
@@ -304,6 +304,7 @@ static void camera_power_off(void) | |||
304 | ctrl_outb(ctrl_inb(PORT_PTDR) & ~0x08, PORT_PTDR); | 304 | ctrl_outb(ctrl_inb(PORT_PTDR) & ~0x08, PORT_PTDR); |
305 | } | 305 | } |
306 | 306 | ||
307 | #ifdef CONFIG_I2C | ||
307 | static unsigned char camera_ov772x_magic[] = | 308 | static unsigned char camera_ov772x_magic[] = |
308 | { | 309 | { |
309 | 0x09, 0x01, 0x0c, 0x10, 0x0d, 0x41, 0x0e, 0x01, | 310 | 0x09, 0x01, 0x0c, 0x10, 0x0d, 0x41, 0x0e, 0x01, |
@@ -391,6 +392,7 @@ static struct platform_device migor_camera_device = { | |||
391 | .platform_data = &ov772x_info, | 392 | .platform_data = &ov772x_info, |
392 | }, | 393 | }, |
393 | }; | 394 | }; |
395 | #endif /* CONFIG_I2C */ | ||
394 | 396 | ||
395 | static struct sh_mobile_ceu_info sh_mobile_ceu_info = { | 397 | static struct sh_mobile_ceu_info sh_mobile_ceu_info = { |
396 | .flags = SOCAM_MASTER | SOCAM_DATAWIDTH_8 | SOCAM_PCLK_SAMPLE_RISING \ | 398 | .flags = SOCAM_MASTER | SOCAM_DATAWIDTH_8 | SOCAM_PCLK_SAMPLE_RISING \ |
@@ -429,7 +431,9 @@ static struct platform_device *migor_devices[] __initdata = { | |||
429 | &sh_keysc_device, | 431 | &sh_keysc_device, |
430 | &migor_lcdc_device, | 432 | &migor_lcdc_device, |
431 | &migor_ceu_device, | 433 | &migor_ceu_device, |
434 | #ifdef CONFIG_I2C | ||
432 | &migor_camera_device, | 435 | &migor_camera_device, |
436 | #endif | ||
433 | &migor_nor_flash_device, | 437 | &migor_nor_flash_device, |
434 | &migor_nand_flash_device, | 438 | &migor_nand_flash_device, |
435 | }; | 439 | }; |