Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (103 commits)
  ARM: 5719/1: [AT91] Fix AC97 breakage
  ARM: 5721/1: MMCI enable the use of a regulator
  ARM: 5720/1: Move MMCI header to amba include dir
  ARM: 5718/1: Sane busids for RealView board components
  ARM: 5715/1: Make kprobes unregistration SMP safe
  ARM: 5711/1: locomo.c: CodingStyle cleanups
  ARM: 5710/1: at91: add AC97 support to at91sam9rl and at91sam9rlek board
  ARM: 5709/1: at91: add AC97 support to at91sam9g45 series and at91sam9m10g45ek board
  ARM: 5621/1: at91/dmaengine: integration of at_hdmac driver in at91sam9g45 series
  ARM: 5620/1: at91/dmaengine: integration of at_hdmac driver in at91sam9rl
  ARM: Add support for checking access permissions on prefetch aborts
  ARM: Separate out access error checking
  ARM: Ensure correct might_sleep() check in pagefault path
  ARM: Update page fault handling for new OOM techniques
  ARM: Provide definitions and helpers for decoding the FSR register
  ARM: 5712/1: SA1100: initialise spinlock in DMA code
  ARM: s3c: fix check of index into s3c_gpios[]
  ARM: spitz: fix touchscreen max presure
  ARM: STMP3xxx: deallocation with negative index of descriptors[]
  Thumb-2: Correctly handle undefined instructions in the kernel
  ...

1 files changed, 52 insertions, 15 deletions

diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c
index 01791d74e08e..bbda57078e0f 100644
--- a/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -321,11 +321,14 @@ static void pcm990_mci_exit(struct device *dev, void *data)
 #define MSECS_PER_JIFFY (1000/HZ)
 
 static struct pxamci_platform_data pcm990_mci_platform_data = {
-        .detect_delay   = 250 / MSECS_PER_JIFFY,
-        .ocr_mask       = MMC_VDD_32_33 | MMC_VDD_33_34,
-        .init           = pcm990_mci_init,
-        .setpower       = pcm990_mci_setpower,
-        .exit           = pcm990_mci_exit,
+        .detect_delay           = 250 / MSECS_PER_JIFFY,
+        .ocr_mask               = MMC_VDD_32_33 | MMC_VDD_33_34,
+        .init                   = pcm990_mci_init,
+        .setpower               = pcm990_mci_setpower,
+        .exit                   = pcm990_mci_exit,
+        .gpio_card_detect       = -1,
+        .gpio_card_ro           = -1,
+        .gpio_power             = -1,
 };
 
 static struct pxaohci_platform_data pcm990_ohci_platform_data = {
@@ -427,25 +430,56 @@ static void pcm990_camera_free_bus(struct soc_camera_link *link)
         gpio_bus_switch = -EINVAL;
 }
 
-static struct soc_camera_link iclink = {
-        .bus_id = 0, /* Must match with the camera ID above */
-        .query_bus_param = pcm990_camera_query_bus_param,
-        .set_bus_param = pcm990_camera_set_bus_param,
-        .free_bus = pcm990_camera_free_bus,
-};
-
 /* Board I2C devices. */
 static struct i2c_board_info __initdata pcm990_i2c_devices[] = {
         {
                 /* Must initialize before the camera(s) */
                 I2C_BOARD_INFO("pca9536", 0x41),
                 .platform_data = &pca9536_data,
-        }, {
+        },
+};
+
+static struct i2c_board_info pcm990_camera_i2c[] = {
+        {
                 I2C_BOARD_INFO("mt9v022", 0x48),
-                .platform_data = &iclink, /* With extender */
         }, {
                 I2C_BOARD_INFO("mt9m001", 0x5d),
-                .platform_data = &iclink, /* With extender */
+        },
+};
+
+static struct soc_camera_link iclink[] = {
+        {
+                .bus_id                 = 0, /* Must match with the camera ID */
+                .board_info             = &pcm990_camera_i2c[0],
+                .i2c_adapter_id         = 0,
+                .query_bus_param        = pcm990_camera_query_bus_param,
+                .set_bus_param          = pcm990_camera_set_bus_param,
+                .free_bus               = pcm990_camera_free_bus,
+                .module_name            = "mt9v022",
+        }, {
+                .bus_id                 = 0, /* Must match with the camera ID */
+                .board_info             = &pcm990_camera_i2c[1],
+                .i2c_adapter_id         = 0,
+                .query_bus_param        = pcm990_camera_query_bus_param,
+                .set_bus_param          = pcm990_camera_set_bus_param,
+                .free_bus               = pcm990_camera_free_bus,
+                .module_name            = "mt9m001",
+        },
+};
+
+static struct platform_device pcm990_camera[] = {
+        {
+                .name   = "soc-camera-pdrv",
+                .id     = 0,
+                .dev    = {
+                        .platform_data = &iclink[0],
+                },
+        }, {
+                .name   = "soc-camera-pdrv",
+                .id     = 1,
+                .dev    = {
+                        .platform_data = &iclink[1],
+                },
         },
 };
 #endif /* CONFIG_VIDEO_PXA27x ||CONFIG_VIDEO_PXA27x_MODULE */
@@ -501,6 +535,9 @@ void __init pcm990_baseboard_init(void)
         pxa_set_camera_info(&pcm990_pxacamera_platform_data);
 
         i2c_register_board_info(0, ARRAY_AND_SIZE(pcm990_i2c_devices));
+
+        platform_device_register(&pcm990_camera[0]);
+        platform_device_register(&pcm990_camera[1]);
 #endif
 
         printk(KERN_INFO "PCM-990 Evaluation baseboard initialized\n");