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

6 files changed, 480 insertions, 0 deletions

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index ffd28e48d75f..04d1a07ced7f 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -40,6 +40,9 @@ choice
 config GUMSTIX_AM200EPD
         bool "Enable AM200EPD board support"
 
+config GUMSTIX_AM300EPD
+        bool "Enable AM300EPD board support"
+
 endchoice
 
 config MACH_INTELMOTE2
@@ -302,6 +305,11 @@ config MACH_MAGICIAN
         select HAVE_PWM
         select PXA_HAVE_BOARD_IRQS
 
+config MACH_HIMALAYA
+        bool "HTC Himalaya Support"
+        select CPU_PXA26x
+        select FB_W100
+
 config MACH_MIOA701
         bool "Mitac Mio A701 Support"
         select PXA27x
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
index 146aba72fa22..361fcfa7531a 100644
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -28,6 +28,7 @@ obj-$(CONFIG_CPU_PXA930)	+= pxa930.o
 # Specific board support
 obj-$(CONFIG_ARCH_GUMSTIX)      += gumstix.o
 obj-$(CONFIG_GUMSTIX_AM200EPD)  += am200epd.o
+obj-$(CONFIG_GUMSTIX_AM300EPD)  += am300epd.o
 obj-$(CONFIG_ARCH_LUBBOCK)      += lubbock.o
 obj-$(CONFIG_MACH_LOGICPD_PXA270) += lpd270.o
 obj-$(CONFIG_MACH_MAINSTONE)    += mainstone.o
@@ -45,6 +46,7 @@ obj-$(CONFIG_MACH_PCM990_BASEBOARD)	+= pcm990-baseboard.o
 obj-$(CONFIG_MACH_TOSA)         += tosa.o
 obj-$(CONFIG_MACH_EM_X270)      += em-x270.o
 obj-$(CONFIG_MACH_MAGICIAN)     += magician.o
+obj-$(CONFIG_MACH_HIMALAYA)     += himalaya.o
 obj-$(CONFIG_MACH_MIOA701)      += mioa701.o mioa701_bootresume.o
 obj-$(CONFIG_ARCH_PXA_ESERIES)  += eseries.o
 obj-$(CONFIG_MACH_E330)         += e330.o
diff --git a/arch/arm/mach-pxa/am300epd.c b/arch/arm/mach-pxa/am300epd.c
new file mode 100644
index 000000000000..4bd10a17332e
--- /dev/null
+++ b/arch/arm/mach-pxa/am300epd.c
@@ -0,0 +1,295 @@
+/*
+ * am300epd.c -- Platform device for AM300 EPD kit
+ *
+ * Copyright (C) 2008, Jaya Kumar
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file COPYING in the main directory of this archive for
+ * more details.
+ *
+ * This work was made possible by help and equipment support from E-Ink
+ * Corporation. http://support.eink.com/community
+ *
+ * This driver is written to be used with the Broadsheet display controller.
+ * on the AM300 EPD prototype kit/development kit with an E-Ink 800x600
+ * Vizplex EPD on a Gumstix board using the Broadsheet interface board.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/irq.h>
+#include <linux/gpio.h>
+
+#include <mach/gumstix.h>
+#include <mach/mfp-pxa25x.h>
+#include <mach/pxafb.h>
+
+#include "generic.h"
+
+#include <video/broadsheetfb.h>
+
+static unsigned int panel_type = 6;
+static struct platform_device *am300_device;
+static struct broadsheet_board am300_board;
+
+static unsigned long am300_pin_config[] __initdata = {
+        GPIO16_GPIO,
+        GPIO17_GPIO,
+        GPIO32_GPIO,
+        GPIO48_GPIO,
+        GPIO49_GPIO,
+        GPIO51_GPIO,
+        GPIO74_GPIO,
+        GPIO75_GPIO,
+        GPIO76_GPIO,
+        GPIO77_GPIO,
+
+        /* this is the 16-bit hdb bus 58-73 */
+        GPIO58_GPIO,
+        GPIO59_GPIO,
+        GPIO60_GPIO,
+        GPIO61_GPIO,
+
+        GPIO62_GPIO,
+        GPIO63_GPIO,
+        GPIO64_GPIO,
+        GPIO65_GPIO,
+
+        GPIO66_GPIO,
+        GPIO67_GPIO,
+        GPIO68_GPIO,
+        GPIO69_GPIO,
+
+        GPIO70_GPIO,
+        GPIO71_GPIO,
+        GPIO72_GPIO,
+        GPIO73_GPIO,
+};
+
+/* register offsets for gpio control */
+#define PWR_GPIO_PIN    16
+#define CFG_GPIO_PIN    17
+#define RDY_GPIO_PIN    32
+#define DC_GPIO_PIN     48
+#define RST_GPIO_PIN    49
+#define LED_GPIO_PIN    51
+#define RD_GPIO_PIN     74
+#define WR_GPIO_PIN     75
+#define CS_GPIO_PIN     76
+#define IRQ_GPIO_PIN    77
+
+/* hdb bus */
+#define DB0_GPIO_PIN    58
+#define DB15_GPIO_PIN   73
+
+static int gpios[] = { PWR_GPIO_PIN, CFG_GPIO_PIN, RDY_GPIO_PIN, DC_GPIO_PIN,
+                        RST_GPIO_PIN, RD_GPIO_PIN, WR_GPIO_PIN, CS_GPIO_PIN,
+                        IRQ_GPIO_PIN, LED_GPIO_PIN };
+static char *gpio_names[] = { "PWR", "CFG", "RDY", "DC", "RST", "RD", "WR",
+                                "CS", "IRQ", "LED" };
+
+static int am300_wait_event(struct broadsheetfb_par *par)
+{
+        /* todo: improve err recovery */
+        wait_event(par->waitq, gpio_get_value(RDY_GPIO_PIN));
+        return 0;
+}
+
+static int am300_init_gpio_regs(struct broadsheetfb_par *par)
+{
+        int i;
+        int err;
+        char dbname[8];
+
+        for (i = 0; i < ARRAY_SIZE(gpios); i++) {
+                err = gpio_request(gpios[i], gpio_names[i]);
+                if (err) {
+                        dev_err(&am300_device->dev, "failed requesting "
+                                "gpio %s, err=%d\n", gpio_names[i], err);
+                        goto err_req_gpio;
+                }
+        }
+
+        /* we also need to take care of the hdb bus */
+        for (i = DB0_GPIO_PIN; i <= DB15_GPIO_PIN; i++) {
+                sprintf(dbname, "DB%d", i);
+                err = gpio_request(i, dbname);
+                if (err) {
+                        dev_err(&am300_device->dev, "failed requesting "
+                                "gpio %d, err=%d\n", i, err);
+                        while (i >= DB0_GPIO_PIN)
+                                gpio_free(i--);
+                        i = ARRAY_SIZE(gpios) - 1;
+                        goto err_req_gpio;
+                }
+        }
+
+        /* setup the outputs and init values */
+        gpio_direction_output(PWR_GPIO_PIN, 0);
+        gpio_direction_output(CFG_GPIO_PIN, 1);
+        gpio_direction_output(DC_GPIO_PIN, 0);
+        gpio_direction_output(RD_GPIO_PIN, 1);
+        gpio_direction_output(WR_GPIO_PIN, 1);
+        gpio_direction_output(CS_GPIO_PIN, 1);
+        gpio_direction_output(RST_GPIO_PIN, 0);
+
+        /* setup the inputs */
+        gpio_direction_input(RDY_GPIO_PIN);
+        gpio_direction_input(IRQ_GPIO_PIN);
+
+        /* start the hdb bus as an input */
+        for (i = DB0_GPIO_PIN; i <= DB15_GPIO_PIN; i++)
+                gpio_direction_output(i, 0);
+
+        /* go into command mode */
+        gpio_set_value(CFG_GPIO_PIN, 1);
+        gpio_set_value(RST_GPIO_PIN, 0);
+        msleep(10);
+        gpio_set_value(RST_GPIO_PIN, 1);
+        msleep(10);
+        am300_wait_event(par);
+
+        return 0;
+
+err_req_gpio:
+        while (i > 0)
+                gpio_free(gpios[i--]);
+
+        return err;
+}
+
+static int am300_init_board(struct broadsheetfb_par *par)
+{
+        return am300_init_gpio_regs(par);
+}
+
+static void am300_cleanup(struct broadsheetfb_par *par)
+{
+        int i;
+
+        free_irq(IRQ_GPIO(RDY_GPIO_PIN), par);
+
+        for (i = 0; i < ARRAY_SIZE(gpios); i++)
+                gpio_free(gpios[i]);
+
+        for (i = DB0_GPIO_PIN; i <= DB15_GPIO_PIN; i++)
+                gpio_free(i);
+
+}
+
+static u16 am300_get_hdb(struct broadsheetfb_par *par)
+{
+        u16 res = 0;
+        int i;
+
+        for (i = 0; i <= (DB15_GPIO_PIN - DB0_GPIO_PIN) ; i++)
+                res |= (gpio_get_value(DB0_GPIO_PIN + i)) ? (1 << i) : 0;
+
+        return res;
+}
+
+static void am300_set_hdb(struct broadsheetfb_par *par, u16 data)
+{
+        int i;
+
+        for (i = 0; i <= (DB15_GPIO_PIN - DB0_GPIO_PIN) ; i++)
+                gpio_set_value(DB0_GPIO_PIN + i, (data >> i) & 0x01);
+}
+
+
+static void am300_set_ctl(struct broadsheetfb_par *par, unsigned char bit,
+                                u8 state)
+{
+        switch (bit) {
+        case BS_CS:
+                gpio_set_value(CS_GPIO_PIN, state);
+                break;
+        case BS_DC:
+                gpio_set_value(DC_GPIO_PIN, state);
+                break;
+        case BS_WR:
+                gpio_set_value(WR_GPIO_PIN, state);
+                break;
+        }
+}
+
+static int am300_get_panel_type(void)
+{
+        return panel_type;
+}
+
+static irqreturn_t am300_handle_irq(int irq, void *dev_id)
+{
+        struct broadsheetfb_par *par = dev_id;
+
+        wake_up(&par->waitq);
+        return IRQ_HANDLED;
+}
+
+static int am300_setup_irq(struct fb_info *info)
+{
+        int ret;
+        struct broadsheetfb_par *par = info->par;
+
+        ret = request_irq(IRQ_GPIO(RDY_GPIO_PIN), am300_handle_irq,
+                                IRQF_DISABLED|IRQF_TRIGGER_RISING,
+                                "AM300", par);
+        if (ret)
+                dev_err(&am300_device->dev, "request_irq failed: %d\n", ret);
+
+        return ret;
+}
+
+static struct broadsheet_board am300_board = {
+        .owner                  = THIS_MODULE,
+        .init                   = am300_init_board,
+        .cleanup                = am300_cleanup,
+        .set_hdb                = am300_set_hdb,
+        .get_hdb                = am300_get_hdb,
+        .set_ctl                = am300_set_ctl,
+        .wait_for_rdy           = am300_wait_event,
+        .get_panel_type         = am300_get_panel_type,
+        .setup_irq              = am300_setup_irq,
+};
+
+int __init am300_init(void)
+{
+        int ret;
+
+        pxa2xx_mfp_config(ARRAY_AND_SIZE(am300_pin_config));
+
+        /* request our platform independent driver */
+        request_module("broadsheetfb");
+
+        am300_device = platform_device_alloc("broadsheetfb", -1);
+        if (!am300_device)
+                return -ENOMEM;
+
+        /* the am300_board that will be seen by broadsheetfb is a copy */
+        platform_device_add_data(am300_device, &am300_board,
+                                        sizeof(am300_board));
+
+        ret = platform_device_add(am300_device);
+
+        if (ret) {
+                platform_device_put(am300_device);
+                return ret;
+        }
+
+        return 0;
+}
+
+module_param(panel_type, uint, 0);
+MODULE_PARM_DESC(panel_type, "Select the panel type: 6, 8, 97");
+
+MODULE_DESCRIPTION("board driver for am300 epd kit");
+MODULE_AUTHOR("Jaya Kumar");
+MODULE_LICENSE("GPL");
diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c
index e296ce11658c..9cb4a074d9f0 100644
--- a/arch/arm/mach-pxa/gumstix.c
+++ b/arch/arm/mach-pxa/gumstix.c
@@ -191,6 +191,11 @@ int __attribute__((weak)) am200_init(void)
         return 0;
 }
 
+int __attribute__((weak)) am300_init(void)
+{
+        return 0;
+}
+
 static void __init carrier_board_init(void)
 {
         /*
@@ -198,6 +203,7 @@ static void __init carrier_board_init(void)
          * they cannot be detected programatically
          */
         am200_init();
+        am300_init();
 }
 
 static void __init gumstix_init(void)
diff --git a/arch/arm/mach-pxa/himalaya.c b/arch/arm/mach-pxa/himalaya.c
new file mode 100644
index 000000000000..00884e5a6042
--- /dev/null
+++ b/arch/arm/mach-pxa/himalaya.c
@@ -0,0 +1,168 @@
+/*
+ * linux/arch/arm/mach-pxa/himalaya.c
+ *
+ * Hardware definitions for the HTC Himalaya
+ *
+ * Based on 2.6.21-hh20's himalaya.c and himalaya_lcd.c
+ *
+ * Copyright (c) 2008 Zbynek Michl <Zbynek.Michl@seznam.cz>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/fb.h>
+#include <linux/platform_device.h>
+
+#include <video/w100fb.h>
+
+#include <asm/setup.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+
+#include <mach/mfp-pxa25x.h>
+#include <mach/hardware.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-regs.h>
+
+#include "generic.h"
+
+/* ---------------------- Himalaya LCD definitions -------------------- */
+
+static struct w100_gen_regs himalaya_lcd_regs = {
+        .lcd_format =        0x00000003,
+        .lcdd_cntl1 =        0x00000000,
+        .lcdd_cntl2 =        0x0003ffff,
+        .genlcd_cntl1 =      0x00fff003,
+        .genlcd_cntl2 =      0x00000003,
+        .genlcd_cntl3 =      0x000102aa,
+};
+
+static struct w100_mode himalaya4_lcd_mode = {
+        .xres           = 240,
+        .yres           = 320,
+        .left_margin    = 0,
+        .right_margin   = 31,
+        .upper_margin   = 15,
+        .lower_margin   = 0,
+        .crtc_ss        = 0x80150014,
+        .crtc_ls        = 0xa0fb00f7,
+        .crtc_gs        = 0xc0080007,
+        .crtc_vpos_gs   = 0x00080007,
+        .crtc_rev       = 0x0000000a,
+        .crtc_dclk      = 0x81700030,
+        .crtc_gclk      = 0x8015010f,
+        .crtc_goe       = 0x00000000,
+        .pll_freq       = 80,
+        .pixclk_divider = 15,
+        .pixclk_divider_rotated = 15,
+        .pixclk_src     = CLK_SRC_PLL,
+        .sysclk_divider = 0,
+        .sysclk_src     = CLK_SRC_PLL,
+};
+
+static struct w100_mode himalaya6_lcd_mode = {
+        .xres           = 240,
+        .yres           = 320,
+        .left_margin    = 9,
+        .right_margin   = 8,
+        .upper_margin   = 5,
+        .lower_margin   = 4,
+        .crtc_ss        = 0x80150014,
+        .crtc_ls        = 0xa0fb00f7,
+        .crtc_gs        = 0xc0080007,
+        .crtc_vpos_gs   = 0x00080007,
+        .crtc_rev       = 0x0000000a,
+        .crtc_dclk      = 0xa1700030,
+        .crtc_gclk      = 0x8015010f,
+        .crtc_goe       = 0x00000000,
+        .pll_freq       = 95,
+        .pixclk_divider = 0xb,
+        .pixclk_divider_rotated = 4,
+        .pixclk_src     = CLK_SRC_PLL,
+        .sysclk_divider = 1,
+        .sysclk_src     = CLK_SRC_PLL,
+};
+
+static struct w100_gpio_regs himalaya_w100_gpio_info = {
+        .init_data1 = 0xffff0000,       /* GPIO_DATA  */
+        .gpio_dir1  = 0x00000000,       /* GPIO_CNTL1 */
+        .gpio_oe1   = 0x003c0000,       /* GPIO_CNTL2 */
+        .init_data2 = 0x00000000,       /* GPIO_DATA2 */
+        .gpio_dir2  = 0x00000000,       /* GPIO_CNTL3 */
+        .gpio_oe2   = 0x00000000,       /* GPIO_CNTL4 */
+};
+
+static struct w100fb_mach_info himalaya_fb_info = {
+        .num_modes  = 1,
+        .regs       = &himalaya_lcd_regs,
+        .gpio       = &himalaya_w100_gpio_info,
+        .xtal_freq = 16000000,
+};
+
+static struct resource himalaya_fb_resources[] = {
+        [0] = {
+                .start  = 0x08000000,
+                .end    = 0x08ffffff,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device himalaya_fb_device = {
+        .name           = "w100fb",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = &himalaya_fb_info,
+        },
+        .num_resources  = ARRAY_SIZE(himalaya_fb_resources),
+        .resource       = himalaya_fb_resources,
+};
+
+/* ----------------------------------------------------------------------- */
+
+static struct platform_device *devices[] __initdata = {
+        &himalaya_fb_device,
+};
+
+static void __init himalaya_lcd_init(void)
+{
+        int himalaya_boardid;
+
+        himalaya_boardid = 0x4; /* hardcoded (detection needs ASIC3 functions) */
+        printk(KERN_INFO "himalaya LCD Driver init. boardid=%d\n",
+                himalaya_boardid);
+
+        switch (himalaya_boardid) {
+        case 0x4:
+                himalaya_fb_info.modelist = &himalaya4_lcd_mode;
+        break;
+        case 0x6:
+                himalaya_fb_info.modelist = &himalaya6_lcd_mode;
+        break;
+        default:
+                printk(KERN_INFO "himalaya lcd_init: unknown boardid=%d. Using 0x4\n",
+                        himalaya_boardid);
+                himalaya_fb_info.modelist = &himalaya4_lcd_mode;
+        }
+}
+
+static void __init himalaya_init(void)
+{
+        himalaya_lcd_init();
+        platform_add_devices(devices, ARRAY_SIZE(devices));
+}
+
+
+MACHINE_START(HIMALAYA, "HTC Himalaya")
+        .phys_io = 0x40000000,
+        .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
+        .boot_params = 0xa0000100,
+        .map_io = pxa_map_io,
+        .init_irq = pxa25x_init_irq,
+        .init_machine = himalaya_init,
+        .timer = &pxa_timer,
+MACHINE_END
diff --git a/arch/arm/mach-pxa/include/mach/gumstix.h b/arch/arm/mach-pxa/include/mach/gumstix.h
index 099f54a41de4..06abd4160607 100644
--- a/arch/arm/mach-pxa/include/mach/gumstix.h
+++ b/arch/arm/mach-pxa/include/mach/gumstix.h
@@ -97,4 +97,5 @@ has detected a cable insertion; driven low otherwise. */
 
 /* for expansion boards that can't be programatically detected */
 extern int am200_init(void);
+extern int am300_init(void);