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

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (407 commits)
  [ARM] pxafb: add support for overlay1 and overlay2 as framebuffer devices
  [ARM] pxafb: cleanup of the timing checking code
  [ARM] pxafb: cleanup of the color format manipulation code
  [ARM] pxafb: add palette format support for LCCR4_PAL_FOR_3
  [ARM] pxafb: add support for FBIOPAN_DISPLAY by dma braching
  [ARM] pxafb: allow pxafb_set_par() to start from arbitrary yoffset
  [ARM] pxafb: allow video memory size to be configurable
  [ARM] pxa: add document on the MFP design and how to use it
  [ARM] sa1100_wdt: don't assume CLOCK_TICK_RATE to be a constant
  [ARM] rtc-sa1100: don't assume CLOCK_TICK_RATE to be a constant
  [ARM] pxa/tavorevb: update board support (smartpanel LCD + keypad)
  [ARM] pxa: Update eseries defconfig
  [ARM] 5352/1: add w90p910-plat config file
  [ARM] s3c: S3C options should depend on PLAT_S3C
  [ARM] mv78xx0: implement GPIO and GPIO interrupt support
  [ARM] Kirkwood: implement GPIO and GPIO interrupt support
  [ARM] Orion: share GPIO IRQ handling code
  [ARM] Orion: share GPIO handling code
  [ARM] s3c: define __io using the typesafe version
  [ARM] S3C64XX: Ensure CPU_V6 is selected
  ...

1 files changed, 124 insertions, 0 deletions

diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c
index d28849b50a14..dfce7d5b659e 100644
--- a/arch/arm/mach-pxa/eseries.c
+++ b/arch/arm/mach-pxa/eseries.c
@@ -12,6 +12,9 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/gpio.h>
+#include <linux/delay.h>
+#include <linux/platform_device.h>
 
 #include <asm/setup.h>
 #include <asm/mach/arch.h>
@@ -21,8 +24,10 @@
 #include <mach/hardware.h>
 #include <mach/eseries-gpio.h>
 #include <mach/udc.h>
+#include <mach/irda.h>
 
 #include "generic.h"
+#include "clock.h"
 
 /* Only e800 has 128MB RAM */
 void __init eseries_fixup(struct machine_desc *desc,
@@ -43,3 +48,122 @@ struct pxa2xx_udc_mach_info e7xx_udc_mach_info = {
         .gpio_pullup_inverted = 1
 };
 
+static void e7xx_irda_transceiver_mode(struct device *dev, int mode)
+{
+        if (mode & IR_OFF) {
+                gpio_set_value(GPIO_E7XX_IR_OFF, 1);
+                pxa2xx_transceiver_mode(dev, mode);
+        } else {
+                pxa2xx_transceiver_mode(dev, mode);
+                gpio_set_value(GPIO_E7XX_IR_OFF, 0);
+        }
+}
+
+int e7xx_irda_init(void)
+{
+        int ret;
+
+        ret = gpio_request(GPIO_E7XX_IR_OFF, "IrDA power");
+        if (ret)
+                goto out;
+
+        ret = gpio_direction_output(GPIO_E7XX_IR_OFF, 0);
+        if (ret)
+                goto out;
+
+        e7xx_irda_transceiver_mode(NULL, IR_SIRMODE | IR_OFF);
+out:
+        return ret;
+}
+
+static void e7xx_irda_shutdown(struct device *dev)
+{
+        e7xx_irda_transceiver_mode(dev, IR_SIRMODE | IR_OFF);
+        gpio_free(GPIO_E7XX_IR_OFF);
+}
+
+struct pxaficp_platform_data e7xx_ficp_platform_data = {
+        .transceiver_cap  = IR_SIRMODE | IR_OFF,
+        .transceiver_mode = e7xx_irda_transceiver_mode,
+        .shutdown = e7xx_irda_shutdown,
+};
+
+int eseries_tmio_enable(struct platform_device *dev)
+{
+        /* Reset - bring SUSPEND high before PCLR */
+        gpio_set_value(GPIO_ESERIES_TMIO_SUSPEND, 0);
+        gpio_set_value(GPIO_ESERIES_TMIO_PCLR, 0);
+        msleep(1);
+        gpio_set_value(GPIO_ESERIES_TMIO_SUSPEND, 1);
+        msleep(1);
+        gpio_set_value(GPIO_ESERIES_TMIO_PCLR, 1);
+        msleep(1);
+        return 0;
+}
+
+int eseries_tmio_disable(struct platform_device *dev)
+{
+        gpio_set_value(GPIO_ESERIES_TMIO_SUSPEND, 0);
+        gpio_set_value(GPIO_ESERIES_TMIO_PCLR, 0);
+        return 0;
+}
+
+int eseries_tmio_suspend(struct platform_device *dev)
+{
+        gpio_set_value(GPIO_ESERIES_TMIO_SUSPEND, 0);
+        return 0;
+}
+
+int eseries_tmio_resume(struct platform_device *dev)
+{
+        gpio_set_value(GPIO_ESERIES_TMIO_SUSPEND, 1);
+        msleep(1);
+        return 0;
+}
+
+void eseries_get_tmio_gpios(void)
+{
+        gpio_request(GPIO_ESERIES_TMIO_SUSPEND, NULL);
+        gpio_request(GPIO_ESERIES_TMIO_PCLR, NULL);
+        gpio_direction_output(GPIO_ESERIES_TMIO_SUSPEND, 0);
+        gpio_direction_output(GPIO_ESERIES_TMIO_PCLR, 0);
+}
+
+/* TMIO controller uses the same resources on all e-series machines. */
+struct resource eseries_tmio_resources[] = {
+        [0] = {
+                .start  = PXA_CS4_PHYS,
+                .end    = PXA_CS4_PHYS + 0x1fffff,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = IRQ_GPIO(GPIO_ESERIES_TMIO_IRQ),
+                .end    = IRQ_GPIO(GPIO_ESERIES_TMIO_IRQ),
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+/* Some e-series hardware cannot control the 32K clock */
+static void clk_32k_dummy(struct clk *clk)
+{
+}
+
+static const struct clkops clk_32k_dummy_ops = {
+        .enable         = clk_32k_dummy,
+        .disable        = clk_32k_dummy,
+};
+
+static struct clk tmio_dummy_clk = {
+        .ops    = &clk_32k_dummy_ops,
+        .rate   = 32768,
+};
+
+static struct clk_lookup eseries_clkregs[] = {
+        INIT_CLKREG(&tmio_dummy_clk, NULL, "CLK_CK32K"),
+};
+
+void eseries_register_clks(void)
+{
+        clks_register(eseries_clkregs, ARRAY_SIZE(eseries_clkregs));
+}
+