Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (56 commits)
  sh: Fix declaration of __kernel_sigreturn and __kernel_rt_sigreturn
  sh: Enable soc-camera in ap325rxa/migor/se7724 defconfigs.
  sh: remove stray markers.
  sh: defconfig updates.
  sh: pci: Initial PCI-Express support for SH7786 Urquell board.
  sh: Generic HAVE_PERF_COUNTER support.
  SH: convert migor to soc-camera as platform-device
  SH: convert ap325rxa to soc-camera as platform-device
  soc-camera: unify i2c camera device platform data
  sh: add platform data for r8a66597-hcd in setup-sh7723
  sh: add platform data for r8a66597-hcd in setup-sh7366
  sh: x3proto: add platform data for r8a66597-hcd
  sh: highlander: add platform data for r8a66597-hcd
  sh: sh7785lcr: add platform data for r8a66597-hcd
  sh: turn off irqs when disabling CMT/TMU timers
  sh: use kzalloc() for cpg clocks
  sh: unbreak WARN_ON()
  sh: Use generic atomic64_t implementation.
  sh: Revised clock function in highlander
  sh: Update r7780mp defconfig
  ...

1 files changed, 33 insertions, 19 deletions

diff --git a/arch/sh/boards/board-ap325rxa.c b/arch/sh/boards/board-ap325rxa.c
index 1c4d83ef2a47..7ffd1b4315bd 100644
--- a/arch/sh/boards/board-ap325rxa.c
+++ b/arch/sh/boards/board-ap325rxa.c
@@ -349,15 +349,6 @@ static int ov7725_power(struct device *dev, int mode)
         return 0;
 }
 
-static struct ov772x_camera_info ov7725_info = {
-        .buswidth  = SOCAM_DATAWIDTH_8,
-        .flags = OV772X_FLAG_VFLIP | OV772X_FLAG_HFLIP,
-        .edgectrl = OV772X_AUTO_EDGECTRL(0xf, 0),
-        .link = {
-                .power  = ov7725_power,
-        },
-};
-
 static struct sh_mobile_ceu_info sh_mobile_ceu_info = {
         .flags = SH_CEU_FLAG_USE_8BIT_BUS,
 };
@@ -402,25 +393,48 @@ static struct platform_device sdcard_cn3_device = {
         },
 };
 
-static struct platform_device *ap325rxa_devices[] __initdata = {
-        &smsc9118_device,
-        &ap325rxa_nor_flash_device,
-        &lcdc_device,
-        &ceu_device,
-        &nand_flash_device,
-        &sdcard_cn3_device,
-};
-
 static struct i2c_board_info __initdata ap325rxa_i2c_devices[] = {
         {
                 I2C_BOARD_INFO("pcf8563", 0x51),
         },
+};
+
+static struct i2c_board_info ap325rxa_i2c_camera[] = {
         {
                 I2C_BOARD_INFO("ov772x", 0x21),
-                .platform_data = &ov7725_info,
         },
 };
 
+static struct ov772x_camera_info ov7725_info = {
+        .buswidth       = SOCAM_DATAWIDTH_8,
+        .flags          = OV772X_FLAG_VFLIP | OV772X_FLAG_HFLIP,
+        .edgectrl       = OV772X_AUTO_EDGECTRL(0xf, 0),
+        .link = {
+                .power          = ov7725_power,
+                .board_info     = &ap325rxa_i2c_camera[0],
+                .i2c_adapter_id = 0,
+                .module_name    = "ov772x",
+        },
+};
+
+static struct platform_device ap325rxa_camera = {
+        .name   = "soc-camera-pdrv",
+        .id     = 0,
+        .dev    = {
+                .platform_data = &ov7725_info.link,
+        },
+};
+
+static struct platform_device *ap325rxa_devices[] __initdata = {
+        &smsc9118_device,
+        &ap325rxa_nor_flash_device,
+        &lcdc_device,
+        &ceu_device,
+        &nand_flash_device,
+        &sdcard_cn3_device,
+        &ap325rxa_camera,
+};
+
 static struct spi_board_info ap325rxa_spi_devices[] = {
         {
                 .modalias = "mmc_spi",