ARM: OMAP: Palm Tungsten E board update

General update of the board file for Palm Tungsten E. Registers the
platform devices contained in the PDA (ROM chip, keypad, infra-red)
and updates the configuration for USB and MMC, whose config values
were previously guessed in most cases due to lack of documentation
(and now are confirmed by a number of users). Macros for GPIO pins are
moved to a file in include/asm-arm/arch-omap.

Signed-off-by: Andrzej Zaborowski <balrog@zabor.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>

4 files changed, 401 insertions, 23 deletions

diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index f6ecdd3a2478..84a3b085ac78 100644
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -84,11 +84,10 @@ config MACH_OMAP_PALMTE
         bool "Palm Tungsten E"
         depends on ARCH_OMAP1 && ARCH_OMAP15XX
         help
-          Support for the Palm Tungsten E PDA. Currently only the LCD panel
-          is supported. To boot the kernel, you'll need a PalmOS compatible
-          bootloader; check out http://palmtelinux.sourceforge.net for more
-          information.
-          Say Y here if you have such a PDA, say NO otherwise.
+          Support for the Palm Tungsten E PDA.  To boot the kernel, you'll
+          need a PalmOS compatible bootloader; check out
+          http://palmtelinux.sourceforge.net/ for more information.
+          Say Y here if you have this PDA model, say N otherwise.
 
 config MACH_NOKIA770
         bool "Nokia 770"
diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c
index 015824185629..2f9d00a00135 100644
--- a/arch/arm/mach-omap1/board-palmte.c
+++ b/arch/arm/mach-omap1/board-palmte.c
@@ -17,49 +17,189 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/input.h>
 #include <linux/platform_device.h>
-#include <linux/notifier.h>
-#include <linux/clk.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/tsc2102.h>
+#include <linux/interrupt.h>
 
+#include <asm/apm.h>
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
+#include <asm/mach/flash.h>
 
 #include <asm/arch/gpio.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/usb.h>
+#include <asm/arch/tc.h>
+#include <asm/arch/dma.h>
 #include <asm/arch/board.h>
+#include <asm/arch/irda.h>
+#include <asm/arch/keypad.h>
 #include <asm/arch/common.h>
+#include <asm/arch/mcbsp.h>
+#include <asm/arch/omap-alsa.h>
 
-static void __init omap_generic_init_irq(void)
+static void __init omap_palmte_init_irq(void)
 {
         omap1_init_common_hw();
         omap_init_irq();
+        omap_gpio_init();
 }
 
+static int palmte_keymap[] = {
+        KEY(0, 0, KEY_F1),
+        KEY(0, 1, KEY_F2),
+        KEY(0, 2, KEY_F3),
+        KEY(0, 3, KEY_F4),
+        KEY(0, 4, KEY_POWER),
+        KEY(1, 0, KEY_LEFT),
+        KEY(1, 1, KEY_DOWN),
+        KEY(1, 2, KEY_UP),
+        KEY(1, 3, KEY_RIGHT),
+        KEY(1, 4, KEY_CENTER),
+        0,
+};
+
+static struct omap_kp_platform_data palmte_kp_data = {
+        .rows   = 8,
+        .cols   = 8,
+        .keymap = palmte_keymap,
+        .rep    = 1,
+        .delay  = 12,
+};
+
+static struct resource palmte_kp_resources[] = {
+        [0]     = {
+                .start  = INT_KEYBOARD,
+                .end    = INT_KEYBOARD,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device palmte_kp_device = {
+        .name           = "omap-keypad",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = &palmte_kp_data,
+        },
+        .num_resources  = ARRAY_SIZE(palmte_kp_resources),
+        .resource       = palmte_kp_resources,
+};
+
+static struct mtd_partition palmte_rom_partitions[] = {
+        /* PalmOS "Small ROM", contains the bootloader and the debugger */
+        {
+                .name           = "smallrom",
+                .offset         = 0,
+                .size           = 0xa000,
+                .mask_flags     = MTD_WRITEABLE,
+        },
+        /* PalmOS "Big ROM", a filesystem with all the OS code and data */
+        {
+                .name           = "bigrom",
+                .offset         = SZ_128K,
+                /*
+                 * 0x5f0000 bytes big in the multi-language ("EFIGS") version,
+                 * 0x7b0000 bytes in the English-only ("enUS") version.
+                 */
+                .size           = 0x7b0000,
+                .mask_flags     = MTD_WRITEABLE,
+        },
+};
+
+static struct flash_platform_data palmte_rom_data = {
+        .map_name       = "map_rom",
+        .width          = 2,
+        .parts          = palmte_rom_partitions,
+        .nr_parts       = ARRAY_SIZE(palmte_rom_partitions),
+};
+
+static struct resource palmte_rom_resource = {
+        .start          = OMAP_CS0_PHYS,
+        .end            = OMAP_CS0_PHYS + SZ_8M - 1,
+        .flags          = IORESOURCE_MEM,
+};
+
+static struct platform_device palmte_rom_device = {
+        .name           = "omapflash",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = &palmte_rom_data,
+        },
+        .num_resources  = 1,
+        .resource       = &palmte_rom_resource,
+};
+
 static struct platform_device palmte_lcd_device = {
         .name           = "lcd_palmte",
         .id             = -1,
 };
 
+static struct omap_backlight_config palmte_backlight_config = {
+        .default_intensity      = 0xa0,
+};
+
+static struct platform_device palmte_backlight_device = {
+        .name           = "omap-bl",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = &palmte_backlight_config,
+        },
+};
+
+static struct omap_irda_config palmte_irda_config = {
+        .transceiver_cap        = IR_SIRMODE,
+        .rx_channel             = OMAP_DMA_UART3_RX,
+        .tx_channel             = OMAP_DMA_UART3_TX,
+        .dest_start             = UART3_THR,
+        .src_start              = UART3_RHR,
+        .tx_trigger             = 0,
+        .rx_trigger             = 0,
+};
+
+static struct resource palmte_irda_resources[] = {
+        [0]     = {
+                .start  = INT_UART3,
+                .end    = INT_UART3,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device palmte_irda_device = {
+        .name           = "omapirda",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = &palmte_irda_config,
+        },
+        .num_resources  = ARRAY_SIZE(palmte_irda_resources),
+        .resource       = palmte_irda_resources,
+};
+
 static struct platform_device *devices[] __initdata = {
+        &palmte_rom_device,
+        &palmte_kp_device,
         &palmte_lcd_device,
+        &palmte_backlight_device,
+        &palmte_irda_device,
 };
 
 static struct omap_usb_config palmte_usb_config __initdata = {
-        .register_dev   = 1,
+        .register_dev   = 1,    /* Mini-B only receptacle */
         .hmc_mode       = 0,
-        .pins[0]        = 3,
+        .pins[0]        = 2,
 };
 
 static struct omap_mmc_config palmte_mmc_config __initdata = {
-        .mmc [0] = {
+        .mmc[0]         = {
                 .enabled        = 1,
-                .wire4          = 1,
-                .wp_pin         = OMAP_MPUIO(3),
-                .power_pin      = -1,
-                .switch_pin     = -1,
+                .wp_pin         = PALMTE_MMC_WP_GPIO,
+                .power_pin      = PALMTE_MMC_POWER_GPIO,
+                .switch_pin     = PALMTE_MMC_SWITCH_GPIO,
         },
 };
 
@@ -67,21 +207,222 @@ static struct omap_lcd_config palmte_lcd_config __initdata = {
         .ctrl_name      = "internal",
 };
 
+static struct omap_uart_config palmte_uart_config __initdata = {
+        .enabled_uarts = (1 << 0) | (1 << 1) | (0 << 2),
+};
+
+static struct omap_mcbsp_reg_cfg palmte_mcbsp1_regs = {
+        .spcr2  = FRST | GRST | XRST | XINTM(3),
+        .xcr2   = XDATDLY(1) | XFIG,
+        .xcr1   = XWDLEN1(OMAP_MCBSP_WORD_32),
+        .pcr0   = SCLKME | FSXP | CLKXP,
+};
+
+static struct omap_alsa_codec_config palmte_alsa_config = {
+        .name                   = "TSC2102 audio",
+        .mcbsp_regs_alsa        = &palmte_mcbsp1_regs,
+        .codec_configure_dev    = NULL, /* tsc2102_configure, */
+        .codec_set_samplerate   = NULL, /* tsc2102_set_samplerate, */
+        .codec_clock_setup      = NULL, /* tsc2102_clock_setup, */
+        .codec_clock_on         = NULL, /* tsc2102_clock_on, */
+        .codec_clock_off        = NULL, /* tsc2102_clock_off, */
+        .get_default_samplerate = NULL, /* tsc2102_get_default_samplerate, */
+};
+
+#ifdef CONFIG_APM
+/*
+ * Values measured in 10 minute intervals averaged over 10 samples.
+ * May differ slightly from device to device but should be accurate
+ * enough to give basic idea of battery life left and trigger
+ * potential alerts.
+ */
+static const int palmte_battery_sample[] = {
+        2194, 2157, 2138, 2120,
+        2104, 2089, 2075, 2061,
+        2048, 2038, 2026, 2016,
+        2008, 1998, 1989, 1980,
+        1970, 1958, 1945, 1928,
+        1910, 1888, 1860, 1827,
+        1791, 1751, 1709, 1656,
+};
+
+#define INTERVAL                10
+#define BATTERY_HIGH_TRESHOLD   66
+#define BATTERY_LOW_TRESHOLD    33
+
+static void palmte_get_power_status(struct apm_power_info *info, int *battery)
+{
+        int charging, batt, hi, lo, mid;
+
+        charging = !omap_get_gpio_datain(PALMTE_DC_GPIO);
+        batt = battery[0];
+        if (charging)
+                batt -= 60;
+
+        hi = ARRAY_SIZE(palmte_battery_sample);
+        lo = 0;
+
+        info->battery_flag = 0;
+        info->units = APM_UNITS_MINS;
+
+        if (batt > palmte_battery_sample[lo]) {
+                info->battery_life = 100;
+                info->time = INTERVAL * ARRAY_SIZE(palmte_battery_sample);
+        } else if (batt <= palmte_battery_sample[hi - 1]) {
+                info->battery_life = 0;
+                info->time = 0;
+        } else {
+                while (hi > lo + 1) {
+                        mid = (hi + lo) >> 2;
+                        if (batt <= palmte_battery_sample[mid])
+                                lo = mid;
+                        else
+                                hi = mid;
+                }
+
+                mid = palmte_battery_sample[lo] - palmte_battery_sample[hi];
+                hi = palmte_battery_sample[lo] - batt;
+                info->battery_life = 100 - (100 * lo + 100 * hi / mid) /
+                        ARRAY_SIZE(palmte_battery_sample);
+                info->time = INTERVAL * (ARRAY_SIZE(palmte_battery_sample) -
+                                lo) - INTERVAL * hi / mid;
+        }
+
+        if (charging) {
+                info->ac_line_status = APM_AC_ONLINE;
+                info->battery_status = APM_BATTERY_STATUS_CHARGING;
+                info->battery_flag |= APM_BATTERY_FLAG_CHARGING;
+        } else {
+                info->ac_line_status = APM_AC_OFFLINE;
+                if (info->battery_life > BATTERY_HIGH_TRESHOLD)
+                        info->battery_status = APM_BATTERY_STATUS_HIGH;
+                else if (info->battery_life > BATTERY_LOW_TRESHOLD)
+                        info->battery_status = APM_BATTERY_STATUS_LOW;
+                else
+                        info->battery_status = APM_BATTERY_STATUS_CRITICAL;
+        }
+
+        if (info->battery_life > BATTERY_HIGH_TRESHOLD)
+                info->battery_flag |= APM_BATTERY_FLAG_HIGH;
+        else if (info->battery_life > BATTERY_LOW_TRESHOLD)
+                info->battery_flag |= APM_BATTERY_FLAG_LOW;
+        else
+                info->battery_flag |= APM_BATTERY_FLAG_CRITICAL;
+}
+#else
+#define palmte_get_power_status NULL
+#endif
+
+static struct tsc2102_config palmte_tsc2102_config = {
+        .use_internal   = 0,
+        .monitor        = TSC_BAT1 | TSC_AUX | TSC_TEMP,
+        .temp_at25c     = { 2200, 2615 },
+        .apm_report     = palmte_get_power_status,
+        .alsa_config    = &palmte_alsa_config,
+};
+
 static struct omap_board_config_kernel palmte_config[] = {
-        { OMAP_TAG_USB, &palmte_usb_config },
-        { OMAP_TAG_MMC, &palmte_mmc_config },
-        { OMAP_TAG_LCD, &palmte_lcd_config },
+        { OMAP_TAG_USB,         &palmte_usb_config },
+        { OMAP_TAG_MMC,         &palmte_mmc_config },
+        { OMAP_TAG_LCD,         &palmte_lcd_config },
+        { OMAP_TAG_UART,        &palmte_uart_config },
 };
 
-static void __init omap_generic_init(void)
+static struct spi_board_info palmte_spi_info[] __initdata = {
+        {
+                .modalias       = "tsc2102",
+                .bus_num        = 2,    /* uWire (officially) */
+                .chip_select    = 0,    /* As opposed to 3 */
+                .irq            = OMAP_GPIO_IRQ(PALMTE_PINTDAV_GPIO),
+                .platform_data  = &palmte_tsc2102_config,
+                .max_speed_hz   = 8000000,
+        },
+};
+
+/* Periodically check for changes on important input pins */
+struct timer_list palmte_pin_timer;
+int prev_power, prev_headphones;
+
+static void palmte_pin_handler(unsigned long data) {
+        int power, headphones;
+
+        power = !omap_get_gpio_datain(PALMTE_DC_GPIO);
+        headphones = omap_get_gpio_datain(PALMTE_HEADPHONES_GPIO);
+
+        if (power && !prev_power)
+                printk(KERN_INFO "PM: cable connected\n");
+        else if (!power && prev_power)
+                printk(KERN_INFO "PM: cable disconnected\n");
+
+        if (headphones && !prev_headphones) {
+                /* Headphones connected, disable speaker */
+                omap_set_gpio_dataout(PALMTE_SPEAKER_GPIO, 0);
+                printk(KERN_INFO "PM: speaker off\n");
+        } else if (!headphones && prev_headphones) {
+                /* Headphones unplugged, re-enable speaker */
+                omap_set_gpio_dataout(PALMTE_SPEAKER_GPIO, 1);
+                printk(KERN_INFO "PM: speaker on\n");
+        }
+
+        prev_power = power;
+        prev_headphones = headphones;
+        mod_timer(&palmte_pin_timer, jiffies + msecs_to_jiffies(500));
+}
+
+static void __init palmte_gpio_setup(void)
+{
+        /* Set TSC2102 PINTDAV pin as input */
+        if (omap_request_gpio(PALMTE_PINTDAV_GPIO)) {
+                printk(KERN_ERR "Could not reserve PINTDAV GPIO!\n");
+                return;
+        }
+        omap_set_gpio_direction(PALMTE_PINTDAV_GPIO, 1);
+
+        /* Monitor cable-connected signals */
+        if (omap_request_gpio(PALMTE_DC_GPIO) ||
+                        omap_request_gpio(PALMTE_USB_OR_DC_GPIO) ||
+                        omap_request_gpio(PALMTE_USBDETECT_GPIO)) {
+                printk(KERN_ERR "Could not reserve cable signal GPIO!\n");
+                return;
+        }
+        omap_set_gpio_direction(PALMTE_DC_GPIO, 1);
+        omap_set_gpio_direction(PALMTE_USB_OR_DC_GPIO, 1);
+        omap_set_gpio_direction(PALMTE_USBDETECT_GPIO, 1);
+
+        /* Set speaker-enable pin as output */
+        if (omap_request_gpio(PALMTE_SPEAKER_GPIO)) {
+                printk(KERN_ERR "Could not reserve speaker GPIO!\n");
+                return;
+        }
+        omap_set_gpio_direction(PALMTE_SPEAKER_GPIO, 0);
+
+        /* Monitor the headphones-connected signal */
+        if (omap_request_gpio(PALMTE_HEADPHONES_GPIO)) {
+                printk(KERN_ERR "Could not reserve headphones signal GPIO!\n");
+                return;
+        }
+        omap_set_gpio_direction(PALMTE_HEADPHONES_GPIO, 1);
+
+        prev_power = omap_get_gpio_datain(PALMTE_DC_GPIO);
+        prev_headphones = !omap_get_gpio_datain(PALMTE_HEADPHONES_GPIO);
+        setup_timer(&palmte_pin_timer, palmte_pin_handler, 0);
+        palmte_pin_handler(0);
+}
+
+static void __init omap_palmte_init(void)
 {
         omap_board_config = palmte_config;
         omap_board_config_size = ARRAY_SIZE(palmte_config);
 
         platform_add_devices(devices, ARRAY_SIZE(devices));
+
+        spi_register_board_info(palmte_spi_info, ARRAY_SIZE(palmte_spi_info));
+
+        omap_serial_init();
+        palmte_gpio_setup();
 }
 
-static void __init omap_generic_map_io(void)
+static void __init omap_palmte_map_io(void)
 {
         omap1_map_common_io();
 }
@@ -90,8 +431,8 @@ MACHINE_START(OMAP_PALMTE, "OMAP310 based Palm Tungsten E")
         .phys_io        = 0xfff00000,
         .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
         .boot_params    = 0x10000100,
-        .map_io         = omap_generic_map_io,
-        .init_irq       = omap_generic_init_irq,
-        .init_machine   = omap_generic_init,
+        .map_io         = omap_palmte_map_io,
+        .init_irq       = omap_palmte_init_irq,
+        .init_machine   = omap_palmte_init,
         .timer          = &omap_timer,
 MACHINE_END
diff --git a/include/asm-arm/arch-omap/board-palmte.h b/include/asm-arm/arch-omap/board-palmte.h
new file mode 100644
index 000000000000..cd22035a7160
--- /dev/null
+++ b/include/asm-arm/arch-omap/board-palmte.h
@@ -0,0 +1,34 @@
+/*
+ * linux/include/asm-arm/arch-omap/board-palmte.h
+ *
+ * Hardware definitions for the Palm Tungsten E device.
+ *
+ * Maintainters :       http://palmtelinux.sf.net
+ *                      palmtelinux-developpers@lists.sf.net
+ *
+ * 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.
+ */
+
+#ifndef __OMAP_BOARD_PALMTE_H
+#define __OMAP_BOARD_PALMTE_H
+
+#include <asm/arch/gpio.h>
+
+#define PALMTE_USBDETECT_GPIO   0
+#define PALMTE_USB_OR_DC_GPIO   1
+#define PALMTE_TSC_GPIO         4
+#define PALMTE_PINTDAV_GPIO     6
+#define PALMTE_MMC_WP_GPIO      8
+#define PALMTE_MMC_POWER_GPIO   9
+#define PALMTE_HDQ_GPIO         11
+#define PALMTE_HEADPHONES_GPIO  14
+#define PALMTE_SPEAKER_GPIO     15
+#define PALMTE_DC_GPIO          OMAP_MPUIO(2)
+#define PALMTE_MMC_SWITCH_GPIO  OMAP_MPUIO(4)
+#define PALMTE_MMC1_GPIO        OMAP_MPUIO(6)
+#define PALMTE_MMC2_GPIO        OMAP_MPUIO(7)
+#define PALMTE_MMC3_GPIO        OMAP_MPUIO(11)
+
+#endif  /* __OMAP_BOARD_PALMTE_H */
diff --git a/include/asm-arm/arch-omap/hardware.h b/include/asm-arm/arch-omap/hardware.h
index e225f4f39b34..539f16d49ab3 100644
--- a/include/asm-arm/arch-omap/hardware.h
+++ b/include/asm-arm/arch-omap/hardware.h
@@ -330,6 +330,10 @@
 #include "board-voiceblue.h"
 #endif
 
+#ifdef CONFIG_MACH_OMAP_PALMTE
+#include "board-palmte.h"
+#endif
+
 #endif /* !__ASSEMBLER__ */
 
 #endif  /* __ASM_ARCH_OMAP_HARDWARE_H */