Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 549 insertions, 0 deletions

diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
new file mode 100644
index 000000000000..d55c57b761a9
--- /dev/null
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -0,0 +1,549 @@
+/*
+ * Copyright (C) 2009 Integration Software and Electronic Engineering.
+ *
+ * Modified from mach-omap2/board-generic.c
+ *
+ * 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/platform_device.h>
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/clk.h>
+#include <linux/io.h>
+#include <linux/gpio.h>
+#include <linux/interrupt.h>
+
+#include <linux/regulator/machine.h>
+#include <linux/i2c/twl.h>
+
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+
+#include <plat/board.h>
+#include <plat/common.h>
+#include <plat/gpmc.h>
+#include <plat/usb.h>
+#include <plat/display.h>
+#include <plat/onenand.h>
+
+#include "mux.h"
+#include "hsmmc.h"
+#include "sdram-numonyx-m65kxxxxam.h"
+
+#define IGEP2_SMSC911X_CS       5
+#define IGEP2_SMSC911X_GPIO     176
+#define IGEP2_GPIO_USBH_NRESET  24
+#define IGEP2_GPIO_LED0_GREEN   26
+#define IGEP2_GPIO_LED0_RED     27
+#define IGEP2_GPIO_LED1_RED     28
+#define IGEP2_GPIO_DVI_PUP      170
+#define IGEP2_GPIO_WIFI_NPD     94
+#define IGEP2_GPIO_WIFI_NRESET  95
+
+#if defined(CONFIG_MTD_ONENAND_OMAP2) || \
+        defined(CONFIG_MTD_ONENAND_OMAP2_MODULE)
+
+#define ONENAND_MAP             0x20000000
+
+/* NAND04GR4E1A ( x2 Flash built-in COMBO POP MEMORY )
+ * Since the device is equipped with two DataRAMs, and two-plane NAND
+ * Flash memory array, these two component enables simultaneous program
+ * of 4KiB. Plane1 has only even blocks such as block0, block2, block4
+ * while Plane2 has only odd blocks such as block1, block3, block5.
+ * So MTD regards it as 4KiB page size and 256KiB block size 64*(2*2048)
+ */
+
+static struct mtd_partition igep2_onenand_partitions[] = {
+        {
+                .name           = "X-Loader",
+                .offset         = 0,
+                .size           = 2 * (64*(2*2048))
+        },
+        {
+                .name           = "U-Boot",
+                .offset         = MTDPART_OFS_APPEND,
+                .size           = 6 * (64*(2*2048)),
+        },
+        {
+                .name           = "Environment",
+                .offset         = MTDPART_OFS_APPEND,
+                .size           = 2 * (64*(2*2048)),
+        },
+        {
+                .name           = "Kernel",
+                .offset         = MTDPART_OFS_APPEND,
+                .size           = 12 * (64*(2*2048)),
+        },
+        {
+                .name           = "File System",
+                .offset         = MTDPART_OFS_APPEND,
+                .size           = MTDPART_SIZ_FULL,
+        },
+};
+
+static int igep2_onenand_setup(void __iomem *onenand_base, int freq)
+{
+       /* nothing is required to be setup for onenand as of now */
+       return 0;
+}
+
+static struct omap_onenand_platform_data igep2_onenand_data = {
+        .parts = igep2_onenand_partitions,
+        .nr_parts = ARRAY_SIZE(igep2_onenand_partitions),
+        .onenand_setup = igep2_onenand_setup,
+        .dma_channel    = -1,   /* disable DMA in OMAP OneNAND driver */
+};
+
+static struct platform_device igep2_onenand_device = {
+        .name           = "omap2-onenand",
+        .id             = -1,
+        .dev = {
+                .platform_data = &igep2_onenand_data,
+        },
+};
+
+void __init igep2_flash_init(void)
+{
+        u8              cs = 0;
+        u8              onenandcs = GPMC_CS_NUM + 1;
+
+        while (cs < GPMC_CS_NUM) {
+                u32 ret = 0;
+                ret = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1);
+
+                /* Check if NAND/oneNAND is configured */
+                if ((ret & 0xC00) == 0x800)
+                        /* NAND found */
+                        pr_err("IGEP v2: Unsupported NAND found\n");
+                else {
+                        ret = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG7);
+                        if ((ret & 0x3F) == (ONENAND_MAP >> 24))
+                                /* ONENAND found */
+                                onenandcs = cs;
+                }
+                cs++;
+        }
+        if (onenandcs > GPMC_CS_NUM) {
+                pr_err("IGEP v2: Unable to find configuration in GPMC\n");
+                return;
+        }
+
+        if (onenandcs < GPMC_CS_NUM) {
+                igep2_onenand_data.cs = onenandcs;
+                if (platform_device_register(&igep2_onenand_device) < 0)
+                        pr_err("IGEP v2: Unable to register OneNAND device\n");
+        }
+}
+
+#else
+void __init igep2_flash_init(void) {}
+#endif
+
+#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
+
+#include <linux/smsc911x.h>
+
+static struct smsc911x_platform_config igep2_smsc911x_config = {
+        .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
+        .irq_type       = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
+        .flags          = SMSC911X_USE_32BIT | SMSC911X_SAVE_MAC_ADDRESS  ,
+        .phy_interface  = PHY_INTERFACE_MODE_MII,
+};
+
+static struct resource igep2_smsc911x_resources[] = {
+        {
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = OMAP_GPIO_IRQ(IGEP2_SMSC911X_GPIO),
+                .end    = OMAP_GPIO_IRQ(IGEP2_SMSC911X_GPIO),
+                .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
+        },
+};
+
+static struct platform_device igep2_smsc911x_device = {
+        .name           = "smsc911x",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(igep2_smsc911x_resources),
+        .resource       = igep2_smsc911x_resources,
+        .dev            = {
+                .platform_data = &igep2_smsc911x_config,
+        },
+};
+
+static inline void __init igep2_init_smsc911x(void)
+{
+        unsigned long cs_mem_base;
+
+        if (gpmc_cs_request(IGEP2_SMSC911X_CS, SZ_16M, &cs_mem_base) < 0) {
+                pr_err("IGEP v2: Failed request for GPMC mem for smsc911x\n");
+                gpmc_cs_free(IGEP2_SMSC911X_CS);
+                return;
+        }
+
+        igep2_smsc911x_resources[0].start = cs_mem_base + 0x0;
+        igep2_smsc911x_resources[0].end   = cs_mem_base + 0xff;
+
+        if ((gpio_request(IGEP2_SMSC911X_GPIO, "SMSC911X IRQ") == 0) &&
+            (gpio_direction_input(IGEP2_SMSC911X_GPIO) == 0)) {
+                gpio_export(IGEP2_SMSC911X_GPIO, 0);
+        } else {
+                pr_err("IGEP v2: Could not obtain gpio for for SMSC911X IRQ\n");
+                return;
+        }
+
+        platform_device_register(&igep2_smsc911x_device);
+}
+
+#else
+static inline void __init igep2_init_smsc911x(void) { }
+#endif
+
+static struct omap_board_config_kernel igep2_config[] __initdata = {
+};
+
+static struct regulator_consumer_supply igep2_vmmc1_supply = {
+        .supply         = "vmmc",
+};
+
+static struct regulator_consumer_supply igep2_vmmc2_supply = {
+        .supply         = "vmmc",
+};
+
+/* VMMC1 for OMAP VDD_MMC1 (i/o) and MMC1 card */
+static struct regulator_init_data igep2_vmmc1 = {
+        .constraints = {
+                .min_uV                 = 1850000,
+                .max_uV                 = 3150000,
+                .valid_modes_mask       = REGULATOR_MODE_NORMAL
+                                        | REGULATOR_MODE_STANDBY,
+                .valid_ops_mask         = REGULATOR_CHANGE_VOLTAGE
+                                        | REGULATOR_CHANGE_MODE
+                                        | REGULATOR_CHANGE_STATUS,
+        },
+        .num_consumer_supplies  = 1,
+        .consumer_supplies      = &igep2_vmmc1_supply,
+};
+
+/* VMMC2 for OMAP VDD_MMC2 (i/o) and MMC2 WIFI */
+static struct regulator_init_data igep2_vmmc2 = {
+        .constraints = {
+                .min_uV                 = 1850000,
+                .max_uV                 = 3150000,
+                .valid_modes_mask       = REGULATOR_MODE_NORMAL
+                                        | REGULATOR_MODE_STANDBY,
+                .valid_ops_mask         = REGULATOR_CHANGE_VOLTAGE
+                                        | REGULATOR_CHANGE_MODE
+                                        | REGULATOR_CHANGE_STATUS,
+        },
+        .num_consumer_supplies  = 1,
+        .consumer_supplies      = &igep2_vmmc2_supply,
+};
+
+static struct omap2_hsmmc_info mmc[] = {
+        {
+                .mmc            = 1,
+                .wires          = 4,
+                .gpio_cd        = -EINVAL,
+                .gpio_wp        = -EINVAL,
+        },
+        {
+                .mmc            = 2,
+                .wires          = 4,
+                .gpio_cd        = -EINVAL,
+                .gpio_wp        = -EINVAL,
+        },
+        {}      /* Terminator */
+};
+
+static int igep2_twl_gpio_setup(struct device *dev,
+                unsigned gpio, unsigned ngpio)
+{
+        /* gpio + 0 is "mmc0_cd" (input/IRQ) */
+        mmc[0].gpio_cd = gpio + 0;
+        omap2_hsmmc_init(mmc);
+
+        /* link regulators to MMC adapters ... we "know" the
+         * regulators will be set up only *after* we return.
+        */
+        igep2_vmmc1_supply.dev = mmc[0].dev;
+        igep2_vmmc2_supply.dev = mmc[1].dev;
+
+        return 0;
+};
+
+static struct twl4030_gpio_platform_data igep2_gpio_data = {
+        .gpio_base      = OMAP_MAX_GPIO_LINES,
+        .irq_base       = TWL4030_GPIO_IRQ_BASE,
+        .irq_end        = TWL4030_GPIO_IRQ_END,
+        .use_leds       = false,
+        .setup          = igep2_twl_gpio_setup,
+};
+
+static struct twl4030_usb_data igep2_usb_data = {
+        .usb_mode       = T2_USB_MODE_ULPI,
+};
+
+static int igep2_enable_dvi(struct omap_dss_device *dssdev)
+{
+        gpio_direction_output(IGEP2_GPIO_DVI_PUP, 1);
+
+        return 0;
+}
+
+static void igep2_disable_dvi(struct omap_dss_device *dssdev)
+{
+        gpio_direction_output(IGEP2_GPIO_DVI_PUP, 0);
+}
+
+static struct omap_dss_device igep2_dvi_device = {
+        .type                   = OMAP_DISPLAY_TYPE_DPI,
+        .name                   = "dvi",
+        .driver_name            = "generic_panel",
+        .phy.dpi.data_lines     = 24,
+        .platform_enable        = igep2_enable_dvi,
+        .platform_disable       = igep2_disable_dvi,
+};
+
+static struct omap_dss_device *igep2_dss_devices[] = {
+        &igep2_dvi_device
+};
+
+static struct omap_dss_board_info igep2_dss_data = {
+        .num_devices    = ARRAY_SIZE(igep2_dss_devices),
+        .devices        = igep2_dss_devices,
+        .default_device = &igep2_dvi_device,
+};
+
+static struct platform_device igep2_dss_device = {
+        .name   = "omapdss",
+        .id     = -1,
+        .dev    = {
+                .platform_data = &igep2_dss_data,
+        },
+};
+
+static struct regulator_consumer_supply igep2_vpll2_supply = {
+        .supply = "vdds_dsi",
+        .dev    = &igep2_dss_device.dev,
+};
+
+static struct regulator_init_data igep2_vpll2 = {
+        .constraints = {
+                .name                   = "VDVI",
+                .min_uV                 = 1800000,
+                .max_uV                 = 1800000,
+                .apply_uV               = true,
+                .valid_modes_mask       = REGULATOR_MODE_NORMAL
+                                        | REGULATOR_MODE_STANDBY,
+                .valid_ops_mask         = REGULATOR_CHANGE_MODE
+                                        | REGULATOR_CHANGE_STATUS,
+        },
+        .num_consumer_supplies  = 1,
+        .consumer_supplies      = &igep2_vpll2_supply,
+};
+
+static void __init igep2_display_init(void)
+{
+        if (gpio_request(IGEP2_GPIO_DVI_PUP, "GPIO_DVI_PUP") &&
+            gpio_direction_output(IGEP2_GPIO_DVI_PUP, 1))
+                pr_err("IGEP v2: Could not obtain gpio GPIO_DVI_PUP\n");
+}
+
+#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE)
+#include <linux/leds.h>
+
+static struct gpio_led igep2_gpio_leds[] = {
+        {
+                .name = "led0:red",
+                .gpio = IGEP2_GPIO_LED0_RED,
+        },
+        {
+                .name = "led0:green",
+                .default_trigger = "heartbeat",
+                .gpio = IGEP2_GPIO_LED0_GREEN,
+        },
+        {
+                .name = "led1:red",
+                .gpio = IGEP2_GPIO_LED1_RED,
+        },
+};
+
+static struct gpio_led_platform_data igep2_led_pdata = {
+        .leds           = igep2_gpio_leds,
+        .num_leds       = ARRAY_SIZE(igep2_gpio_leds),
+};
+
+static struct platform_device igep2_led_device = {
+         .name   = "leds-gpio",
+         .id     = -1,
+         .dev    = {
+                 .platform_data  =  &igep2_led_pdata,
+        },
+};
+
+static void __init igep2_init_led(void)
+{
+        platform_device_register(&igep2_led_device);
+}
+
+#else
+static inline void igep2_init_led(void) {}
+#endif
+
+static struct platform_device *igep2_devices[] __initdata = {
+        &igep2_dss_device,
+};
+
+static void __init igep2_init_irq(void)
+{
+        omap_board_config = igep2_config;
+        omap_board_config_size = ARRAY_SIZE(igep2_config);
+        omap2_init_common_hw(m65kxxxxam_sdrc_params, m65kxxxxam_sdrc_params);
+        omap_init_irq();
+        omap_gpio_init();
+}
+
+static struct twl4030_codec_audio_data igep2_audio_data = {
+        .audio_mclk = 26000000,
+};
+
+static struct twl4030_codec_data igep2_codec_data = {
+        .audio_mclk = 26000000,
+        .audio = &igep2_audio_data,
+};
+
+static struct twl4030_platform_data igep2_twldata = {
+        .irq_base       = TWL4030_IRQ_BASE,
+        .irq_end        = TWL4030_IRQ_END,
+
+        /* platform_data for children goes here */
+        .usb            = &igep2_usb_data,
+        .codec          = &igep2_codec_data,
+        .gpio           = &igep2_gpio_data,
+        .vmmc1          = &igep2_vmmc1,
+        .vmmc2          = &igep2_vmmc2,
+        .vpll2          = &igep2_vpll2,
+
+};
+
+static struct i2c_board_info __initdata igep2_i2c_boardinfo[] = {
+        {
+                I2C_BOARD_INFO("twl4030", 0x48),
+                .flags          = I2C_CLIENT_WAKE,
+                .irq            = INT_34XX_SYS_NIRQ,
+                .platform_data  = &igep2_twldata,
+        },
+};
+
+static int __init igep2_i2c_init(void)
+{
+        omap_register_i2c_bus(1, 2600, igep2_i2c_boardinfo,
+                        ARRAY_SIZE(igep2_i2c_boardinfo));
+        /* Bus 3 is attached to the DVI port where devices like the pico DLP
+         * projector don't work reliably with 400kHz */
+        omap_register_i2c_bus(3, 100, NULL, 0);
+        return 0;
+}
+
+static struct omap_musb_board_data musb_board_data = {
+        .interface_type         = MUSB_INTERFACE_ULPI,
+        .mode                   = MUSB_OTG,
+        .power                  = 100,
+};
+
+static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
+        .port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
+        .port_mode[1] = EHCI_HCD_OMAP_MODE_UNKNOWN,
+        .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
+
+        .phy_reset = true,
+        .reset_gpio_port[0] = IGEP2_GPIO_USBH_NRESET,
+        .reset_gpio_port[1] = -EINVAL,
+        .reset_gpio_port[2] = -EINVAL,
+};
+
+#ifdef CONFIG_OMAP_MUX
+static struct omap_board_mux board_mux[] __initdata = {
+        { .reg_offset = OMAP_MUX_TERMINATOR },
+};
+#else
+#define board_mux       NULL
+#endif
+
+static void __init igep2_init(void)
+{
+        omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
+        igep2_i2c_init();
+        platform_add_devices(igep2_devices, ARRAY_SIZE(igep2_devices));
+        omap_serial_init();
+        usb_musb_init(&musb_board_data);
+        usb_ehci_init(&ehci_pdata);
+
+        igep2_flash_init();
+        igep2_init_led();
+        igep2_display_init();
+        igep2_init_smsc911x();
+
+        /* GPIO userspace leds */
+#if !defined(CONFIG_LEDS_GPIO) && !defined(CONFIG_LEDS_GPIO_MODULE)
+        if ((gpio_request(IGEP2_GPIO_LED0_RED, "led0:red") == 0) &&
+            (gpio_direction_output(IGEP2_GPIO_LED0_RED, 1) == 0)) {
+                gpio_export(IGEP2_GPIO_LED0_RED, 0);
+                gpio_set_value(IGEP2_GPIO_LED0_RED, 0);
+        } else
+                pr_warning("IGEP v2: Could not obtain gpio GPIO_LED0_RED\n");
+
+        if ((gpio_request(IGEP2_GPIO_LED0_GREEN, "led0:green") == 0) &&
+            (gpio_direction_output(IGEP2_GPIO_LED0_GREEN, 1) == 0)) {
+                gpio_export(IGEP2_GPIO_LED0_GREEN, 0);
+                gpio_set_value(IGEP2_GPIO_LED0_GREEN, 0);
+        } else
+                pr_warning("IGEP v2: Could not obtain gpio GPIO_LED0_GREEN\n");
+
+        if ((gpio_request(IGEP2_GPIO_LED1_RED, "led1:red") == 0) &&
+            (gpio_direction_output(IGEP2_GPIO_LED1_RED, 1) == 0)) {
+                gpio_export(IGEP2_GPIO_LED1_RED, 0);
+                gpio_set_value(IGEP2_GPIO_LED1_RED, 0);
+        } else
+                pr_warning("IGEP v2: Could not obtain gpio GPIO_LED1_RED\n");
+#endif
+
+        /* GPIO W-LAN + Bluetooth combo module */
+        if ((gpio_request(IGEP2_GPIO_WIFI_NPD, "GPIO_WIFI_NPD") == 0) &&
+            (gpio_direction_output(IGEP2_GPIO_WIFI_NPD, 1) == 0)) {
+                gpio_export(IGEP2_GPIO_WIFI_NPD, 0);
+/*              gpio_set_value(IGEP2_GPIO_WIFI_NPD, 0); */
+        } else
+                pr_warning("IGEP v2: Could not obtain gpio GPIO_WIFI_NPD\n");
+
+        if ((gpio_request(IGEP2_GPIO_WIFI_NRESET, "GPIO_WIFI_NRESET") == 0) &&
+            (gpio_direction_output(IGEP2_GPIO_WIFI_NRESET, 1) == 0)) {
+                gpio_export(IGEP2_GPIO_WIFI_NRESET, 0);
+                gpio_set_value(IGEP2_GPIO_WIFI_NRESET, 0);
+                udelay(10);
+                gpio_set_value(IGEP2_GPIO_WIFI_NRESET, 1);
+        } else
+                pr_warning("IGEP v2: Could not obtain gpio GPIO_WIFI_NRESET\n");
+}
+
+static void __init igep2_map_io(void)
+{
+        omap2_set_globals_343x();
+        omap34xx_map_common_io();
+}
+
+MACHINE_START(IGEP0020, "IGEP v2 board")
+        .phys_io        = 0x48000000,
+        .io_pg_offst    = ((0xfa000000) >> 18) & 0xfffc,
+        .boot_params    = 0x80000100,
+        .map_io         = igep2_map_io,
+        .init_irq       = igep2_init_irq,
+        .init_machine   = igep2_init,
+        .timer          = &omap_timer,
+MACHINE_END