[ARM] 3433/1: ARM: OMAP: 8/8 Update board files

Patch from Tony Lindgren

This patch syncs OMAP board support with linux-omap tree.
The highlights of the patch are:
- Add support for Nokia 770 by Juha Yrjola
- Add support for Samsung Apollon by Kyungmin Park
- Add support for Amstrad E3 videophone by Jonathan McDowell
- Remove board-netstar.c board support as requested by Ladislav Michl
- Do platform_device registration in board files by Komal Shah et al.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 186 insertions, 14 deletions

diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 89f0cc74a519..cd3a06dfc0a8 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -24,7 +24,9 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
+#include <linux/input.h>
 
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
@@ -35,12 +37,55 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/tc.h>
+#include <asm/arch/irda.h>
 #include <asm/arch/usb.h>
+#include <asm/arch/keypad.h>
 #include <asm/arch/common.h>
+#include <asm/arch/mcbsp.h>
+#include <asm/arch/omap-alsa.h>
 
 extern int omap_gpio_init(void);
 
-static struct mtd_partition h2_partitions[] = {
+static int h2_keymap[] = {
+        KEY(0, 0, KEY_LEFT),
+        KEY(0, 1, KEY_RIGHT),
+        KEY(0, 2, KEY_3),
+        KEY(0, 3, KEY_F10),
+        KEY(0, 4, KEY_F5),
+        KEY(0, 5, KEY_9),
+        KEY(1, 0, KEY_DOWN),
+        KEY(1, 1, KEY_UP),
+        KEY(1, 2, KEY_2),
+        KEY(1, 3, KEY_F9),
+        KEY(1, 4, KEY_F7),
+        KEY(1, 5, KEY_0),
+        KEY(2, 0, KEY_ENTER),
+        KEY(2, 1, KEY_6),
+        KEY(2, 2, KEY_1),
+        KEY(2, 3, KEY_F2),
+        KEY(2, 4, KEY_F6),
+        KEY(2, 5, KEY_HOME),
+        KEY(3, 0, KEY_8),
+        KEY(3, 1, KEY_5),
+        KEY(3, 2, KEY_F12),
+        KEY(3, 3, KEY_F3),
+        KEY(3, 4, KEY_F8),
+        KEY(3, 5, KEY_END),
+        KEY(4, 0, KEY_7),
+        KEY(4, 1, KEY_4),
+        KEY(4, 2, KEY_F11),
+        KEY(4, 3, KEY_F1),
+        KEY(4, 4, KEY_F4),
+        KEY(4, 5, KEY_ESC),
+        KEY(5, 0, KEY_F13),
+        KEY(5, 1, KEY_F14),
+        KEY(5, 2, KEY_F15),
+        KEY(5, 3, KEY_F16),
+        KEY(5, 4, KEY_SLEEP),
+        0
+};
+
+static struct mtd_partition h2_nor_partitions[] = {
         /* bootloader (U-Boot, etc) in first sector */
         {
               .name             = "bootloader",
@@ -71,26 +116,26 @@ static struct mtd_partition h2_partitions[] = {
         }
 };
 
-static struct flash_platform_data h2_flash_data = {
+static struct flash_platform_data h2_nor_data = {
         .map_name       = "cfi_probe",
         .width          = 2,
-        .parts          = h2_partitions,
-        .nr_parts       = ARRAY_SIZE(h2_partitions),
+        .parts          = h2_nor_partitions,
+        .nr_parts       = ARRAY_SIZE(h2_nor_partitions),
 };
 
-static struct resource h2_flash_resource = {
+static struct resource h2_nor_resource = {
         /* This is on CS3, wherever it's mapped */
         .flags          = IORESOURCE_MEM,
 };
 
-static struct platform_device h2_flash_device = {
+static struct platform_device h2_nor_device = {
         .name           = "omapflash",
         .id             = 0,
         .dev            = {
-                .platform_data  = &h2_flash_data,
+                .platform_data  = &h2_nor_data,
         },
         .num_resources  = 1,
-        .resource       = &h2_flash_resource,
+        .resource       = &h2_nor_resource,
 };
 
 static struct resource h2_smc91x_resources[] = {
@@ -113,9 +158,119 @@ static struct platform_device h2_smc91x_device = {
         .resource       = h2_smc91x_resources,
 };
 
+static struct resource h2_kp_resources[] = {
+        [0] = {
+                .start  = INT_KEYBOARD,
+                .end    = INT_KEYBOARD,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct omap_kp_platform_data h2_kp_data = {
+        .rows   = 8,
+        .cols   = 8,
+        .keymap = h2_keymap,
+        .rep    = 1,
+};
+
+static struct platform_device h2_kp_device = {
+        .name           = "omap-keypad",
+        .id             = -1,
+        .dev            = {
+                .platform_data = &h2_kp_data,
+        },
+        .num_resources  = ARRAY_SIZE(h2_kp_resources),
+        .resource       = h2_kp_resources,
+};
+
+#define H2_IRDA_FIRSEL_GPIO_PIN 17
+
+#if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)
+static int h2_transceiver_mode(struct device *dev, int state)
+{
+        if (state & IR_SIRMODE)
+                omap_set_gpio_dataout(H2_IRDA_FIRSEL_GPIO_PIN, 0);
+        else    /* MIR/FIR */
+                omap_set_gpio_dataout(H2_IRDA_FIRSEL_GPIO_PIN, 1);
+
+        return 0;
+}
+#endif
+
+static struct omap_irda_config h2_irda_data = {
+        .transceiver_cap        = IR_SIRMODE | IR_MIRMODE | IR_FIRMODE,
+        .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 h2_irda_resources[] = {
+        [0] = {
+                .start  = INT_UART3,
+                .end    = INT_UART3,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+static struct platform_device h2_irda_device = {
+        .name           = "omapirda",
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &h2_irda_data,
+        },
+        .num_resources  = ARRAY_SIZE(h2_irda_resources),
+        .resource       = h2_irda_resources,
+};
+
+static struct platform_device h2_lcd_device = {
+        .name           = "lcd_h2",
+        .id             = -1,
+};
+
+static struct omap_mcbsp_reg_cfg mcbsp_regs = {
+        .spcr2 = FREE | FRST | GRST | XRST | XINTM(3),
+        .spcr1 = RINTM(3) | RRST,
+        .rcr2  = RPHASE | RFRLEN2(OMAP_MCBSP_WORD_8) |
+                RWDLEN2(OMAP_MCBSP_WORD_16) | RDATDLY(1),
+        .rcr1  = RFRLEN1(OMAP_MCBSP_WORD_8) | RWDLEN1(OMAP_MCBSP_WORD_16),
+        .xcr2  = XPHASE | XFRLEN2(OMAP_MCBSP_WORD_8) |
+                XWDLEN2(OMAP_MCBSP_WORD_16) | XDATDLY(1) | XFIG,
+        .xcr1  = XFRLEN1(OMAP_MCBSP_WORD_8) | XWDLEN1(OMAP_MCBSP_WORD_16),
+        .srgr1 = FWID(15),
+        .srgr2 = GSYNC | CLKSP | FSGM | FPER(31),
+
+        .pcr0  = CLKXM | CLKRM | FSXP | FSRP | CLKXP | CLKRP,
+        //.pcr0 = CLKXP | CLKRP,        /* mcbsp: slave */
+};
+
+static struct omap_alsa_codec_config alsa_config = {
+        .name                   = "H2 TSC2101",
+        .mcbsp_regs_alsa        = &mcbsp_regs,
+        .codec_configure_dev    = NULL, // tsc2101_configure,
+        .codec_set_samplerate   = NULL, // tsc2101_set_samplerate,
+        .codec_clock_setup      = NULL, // tsc2101_clock_setup,
+        .codec_clock_on         = NULL, // tsc2101_clock_on,
+        .codec_clock_off        = NULL, // tsc2101_clock_off,
+        .get_default_samplerate = NULL, // tsc2101_get_default_samplerate,
+};
+
+static struct platform_device h2_mcbsp1_device = {
+        .name   = "omap_alsa_mcbsp",
+        .id     = 1,
+        .dev = {
+                .platform_data  = &alsa_config,
+        },
+};
+
 static struct platform_device *h2_devices[] __initdata = {
-        &h2_flash_device,
+        &h2_nor_device,
         &h2_smc91x_device,
+        &h2_irda_device,
+        &h2_kp_device,
+        &h2_lcd_device,
+        &h2_mcbsp1_device,
 };
 
 static void __init h2_init_smc91x(void)
@@ -164,7 +319,6 @@ static struct omap_uart_config h2_uart_config __initdata = {
 };
 
 static struct omap_lcd_config h2_lcd_config __initdata = {
-        .panel_name     = "h2",
         .ctrl_name      = "internal",
 };
 
@@ -177,16 +331,34 @@ static struct omap_board_config_kernel h2_config[] = {
 
 static void __init h2_init(void)
 {
-        /* NOTE: revC boards support NAND-boot, which can put NOR on CS2B
-         * and NAND (either 16bit or 8bit) on CS3.
+        /* Here we assume the NOR boot config:  NOR on CS3 (possibly swapped
+         * to address 0 by a dip switch), NAND on CS2B.  The NAND driver will
+         * notice whether a NAND chip is enabled at probe time.
+         *
+         * FIXME revC boards (and H3) support NAND-boot, with a dip switch to
+         * put NOR on CS2B and NAND (which on H2 may be 16bit) on CS3.  Try
+         * detecting that in code here, to avoid probing every possible flash
+         * configuration...
          */
-        h2_flash_resource.end = h2_flash_resource.start = omap_cs3_phys();
-        h2_flash_resource.end += SZ_32M - 1;
+        h2_nor_resource.end = h2_nor_resource.start = omap_cs3_phys();
+        h2_nor_resource.end += SZ_32M - 1;
+
+        omap_cfg_reg(L3_1610_FLASH_CS2B_OE);
+        omap_cfg_reg(M8_1610_FLASH_CS2B_WE);
 
         /* MMC:  card detect and WP */
         // omap_cfg_reg(U19_ARMIO1);            /* CD */
         omap_cfg_reg(BALLOUT_V8_ARMIO3);        /* WP */
 
+        /* Irda */
+#if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE)
+        omap_writel(omap_readl(FUNC_MUX_CTRL_A) | 7, FUNC_MUX_CTRL_A);
+        if (!(omap_request_gpio(H2_IRDA_FIRSEL_GPIO_PIN))) {
+                omap_set_gpio_direction(H2_IRDA_FIRSEL_GPIO_PIN, 0);
+                h2_irda_data.transceiver_mode = h2_transceiver_mode;
+        }
+#endif
+
         platform_add_devices(h2_devices, ARRAY_SIZE(h2_devices));
         omap_board_config = h2_config;
         omap_board_config_size = ARRAY_SIZE(h2_config);