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

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (95 commits)
  [ARM] 4578/1: CM-x270: PCMCIA support
  [ARM] 4577/1: ITE 8152 PCI bridge support
  [ARM] 4576/1: CM-X270 machine support
  [ARM] pxa: Avoid pxa_gpio_mode() in gpio_direction_{in,out}put()
  [ARM] pxa: move pxa_set_mode() from pxa2xx_mainstone.c to mainstone.c
  [ARM] pxa: move pxa_set_mode() from pxa2xx_lubbock.c to lubbock.c
  [ARM] pxa: Make cpu_is_pxaXXX dependent on configuration symbols
  [ARM] pxa: PXA3xx base support
  [NET] smc91x: fix PXA DMA support code
  [SERIAL] Fix console initialisation ordering
  [ARM] pxa: tidy up arch/arm/mach-pxa/Makefile
  [ARM] Update arch/arm/Kconfig for drivers/Kconfig changes
  [ARM] 4600/1: fix kernel build failure with build-id-supporting binutils
  [ARM] 4599/1: Preserve ATAG list for use with kexec (2.6.23)
  [ARM] Rename consistent_sync() as dma_cache_maint()
  [ARM] 4572/1: ep93xx: add cirrus logic edb9307 support
  [ARM] 4596/1: S3C2412: Correct IRQs for SDI+CF and add decoding support
  [ARM] 4595/1: ns9xxx: define registers as void __iomem * instead of volatile u32
  [ARM] 4594/1: ns9xxx: use the new gpio functions
  [ARM] 4593/1: ns9xxx: implement generic clockevents
  ...

1 files changed, 55 insertions, 0 deletions

diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index a61bf455ee02..5db182da322b 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -29,6 +29,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/i2c.h>
@@ -308,6 +309,18 @@ static struct platform_device osk5912_kp_device = {
         .resource       = osk5912_kp_resources,
 };
 
+static struct omap_backlight_config mistral_bl_data = {
+        .default_intensity      = 0xa0,
+};
+
+static struct platform_device mistral_bl_device = {
+        .name           = "omap-bl",
+        .id             = -1,
+        .dev            = {
+                .platform_data = &mistral_bl_data,
+        },
+};
+
 static struct platform_device osk5912_lcd_device = {
         .name           = "lcd_osk",
         .id             = -1,
@@ -315,6 +328,7 @@ static struct platform_device osk5912_lcd_device = {
 
 static struct platform_device *mistral_devices[] __initdata = {
         &osk5912_kp_device,
+        &mistral_bl_device,
         &osk5912_lcd_device,
 };
 
@@ -358,6 +372,38 @@ static void __init osk_mistral_init(void)
          * can't talk to the ads or even the i2c eeprom.
          */
 
+        /* parallel camera interface */
+        omap_cfg_reg(J15_1610_CAM_LCLK);
+        omap_cfg_reg(J18_1610_CAM_D7);
+        omap_cfg_reg(J19_1610_CAM_D6);
+        omap_cfg_reg(J14_1610_CAM_D5);
+        omap_cfg_reg(K18_1610_CAM_D4);
+        omap_cfg_reg(K19_1610_CAM_D3);
+        omap_cfg_reg(K15_1610_CAM_D2);
+        omap_cfg_reg(K14_1610_CAM_D1);
+        omap_cfg_reg(L19_1610_CAM_D0);
+        omap_cfg_reg(L18_1610_CAM_VS);
+        omap_cfg_reg(L15_1610_CAM_HS);
+        omap_cfg_reg(M19_1610_CAM_RSTZ);
+        omap_cfg_reg(Y15_1610_CAM_OUTCLK);
+
+        /* serial camera interface */
+        omap_cfg_reg(H19_1610_CAM_EXCLK);
+        omap_cfg_reg(W13_1610_CCP_CLKM);
+        omap_cfg_reg(Y12_1610_CCP_CLKP);
+        /* CCP_DATAM CONFLICTS WITH UART1.TX (and serial console) */
+        // omap_cfg_reg(Y14_1610_CCP_DATAM);
+        omap_cfg_reg(W14_1610_CCP_DATAP);
+
+        /* CAM_PWDN */
+        if (omap_request_gpio(11) == 0) {
+                omap_cfg_reg(N20_1610_GPIO11);
+                omap_set_gpio_direction(11, 0 /* out */);
+                omap_set_gpio_dataout(11, 0 /* off */);
+        } else
+                pr_debug("OSK+Mistral: CAM_PWDN is awol\n");
+
+
         // omap_cfg_reg(P19_1610_GPIO6);        // BUSY
         omap_cfg_reg(P20_1610_GPIO4);   // PENIRQ
         set_irq_type(OMAP_GPIO_IRQ(4), IRQT_FALLING);
@@ -388,6 +434,15 @@ static void __init osk_mistral_init(void)
         } else
                 printk(KERN_ERR "OSK+Mistral: wakeup button is awol\n");
 
+        /* LCD:  backlight, and power; power controls other devices on the
+         * board, like the touchscreen, EEPROM, and wakeup (!) switch.
+         */
+        omap_cfg_reg(PWL);
+        if (omap_request_gpio(2) == 0) {
+                omap_set_gpio_direction(2, 0 /* out */);
+                omap_set_gpio_dataout(2, 1 /* on */);
+        }
+
         platform_add_devices(mistral_devices, ARRAY_SIZE(mistral_devices));
 }
 #else