Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup
[linux-3.10.git] / arch / arm / mach-imx / mach-mx35_3ds.c
index b3b9bd8..a42f4f0 100644 (file)
@@ -4,6 +4,11 @@
  *
  * Author: Fabio Estevam <fabio.estevam@freescale.com>
  *
+ * Copyright (C) 2011 Meprolight, Ltd.
+ * Alex Gershgorin <alexg@meprolight.com>
+ *
+ * Modified from i.MX31 3-Stack Development System
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
 #include <linux/usb/otg.h>
 
 #include <linux/mtd/physmap.h>
+#include <linux/mfd/mc13892.h>
+#include <linux/regulator/machine.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 #include <asm/mach/map.h>
+#include <asm/memblock.h>
 
-#include <mach/hardware.h>
-#include <mach/common.h>
-#include <mach/iomux-mx35.h>
-#include <mach/irqs.h>
-#include <mach/3ds_debugboard.h>
+#include <video/platform_lcd.h>
 
+#include <media/soc_camera.h>
+
+#include "3ds_debugboard.h"
+#include "common.h"
 #include "devices-imx35.h"
+#include "hardware.h"
+#include "iomux-mx35.h"
+
+#define GPIO_MC9S08DZ60_GPS_ENABLE 0
+#define GPIO_MC9S08DZ60_HDD_ENABLE 4
+#define GPIO_MC9S08DZ60_WIFI_ENABLE 5
+#define GPIO_MC9S08DZ60_LCD_ENABLE 6
+#define GPIO_MC9S08DZ60_SPEAKER_ENABLE 8
+
+static const struct fb_videomode fb_modedb[] = {
+       {
+                /* 800x480 @ 55 Hz */
+               .name = "Ceramate-CLAA070VC01",
+               .refresh = 55,
+               .xres = 800,
+               .yres = 480,
+               .pixclock = 40000,
+               .left_margin = 40,
+               .right_margin = 40,
+               .upper_margin = 5,
+               .lower_margin = 5,
+               .hsync_len = 20,
+               .vsync_len = 10,
+               .sync = FB_SYNC_OE_ACT_HIGH,
+               .vmode = FB_VMODE_NONINTERLACED,
+               .flag = 0,
+        },
+};
+
+static struct mx3fb_platform_data mx3fb_pdata __initdata = {
+       .name = "Ceramate-CLAA070VC01",
+       .mode = fb_modedb,
+       .num_modes = ARRAY_SIZE(fb_modedb),
+};
+
+static struct i2c_board_info __initdata i2c_devices_3ds[] = {
+       {
+               I2C_BOARD_INFO("mc9s08dz60", 0x69),
+       },
+};
+
+static int lcd_power_gpio = -ENXIO;
+
+static int mc9s08dz60_gpiochip_match(struct gpio_chip *chip, void *data)
+{
+       return !strcmp(chip->label, data);
+}
 
-#define EXPIO_PARENT_INT       gpio_to_irq(IMX_GPIO_NR(1, 1))
+static void mx35_3ds_lcd_set_power(
+                               struct plat_lcd_data *pd, unsigned int power)
+{
+       struct gpio_chip *chip;
+
+       if (!gpio_is_valid(lcd_power_gpio)) {
+               chip = gpiochip_find(
+                               "mc9s08dz60", mc9s08dz60_gpiochip_match);
+               if (chip) {
+                       lcd_power_gpio =
+                               chip->base + GPIO_MC9S08DZ60_LCD_ENABLE;
+                       if (gpio_request(lcd_power_gpio, "lcd_power") < 0) {
+                               pr_err("error: gpio already requested!\n");
+                               lcd_power_gpio = -ENXIO;
+                       }
+               } else {
+                       pr_err("error: didn't find mc9s08dz60 gpio chip\n");
+               }
+       }
+
+       if (gpio_is_valid(lcd_power_gpio))
+               gpio_set_value_cansleep(lcd_power_gpio, power);
+}
+
+static struct plat_lcd_data mx35_3ds_lcd_data = {
+       .set_power = mx35_3ds_lcd_set_power,
+};
+
+static struct platform_device mx35_3ds_lcd = {
+       .name = "platform-lcd",
+       .dev.platform_data = &mx35_3ds_lcd_data,
+};
 
 static const struct imxuart_platform_data uart_pdata __initconst = {
        .flags = IMXUART_HAVE_RTSCTS,
@@ -120,8 +206,297 @@ static iomux_v3_cfg_t mx35pdk_pads[] = {
        /* I2C1 */
        MX35_PAD_I2C1_CLK__I2C1_SCL,
        MX35_PAD_I2C1_DAT__I2C1_SDA,
+       /* Display */
+       MX35_PAD_LD0__IPU_DISPB_DAT_0,
+       MX35_PAD_LD1__IPU_DISPB_DAT_1,
+       MX35_PAD_LD2__IPU_DISPB_DAT_2,
+       MX35_PAD_LD3__IPU_DISPB_DAT_3,
+       MX35_PAD_LD4__IPU_DISPB_DAT_4,
+       MX35_PAD_LD5__IPU_DISPB_DAT_5,
+       MX35_PAD_LD6__IPU_DISPB_DAT_6,
+       MX35_PAD_LD7__IPU_DISPB_DAT_7,
+       MX35_PAD_LD8__IPU_DISPB_DAT_8,
+       MX35_PAD_LD9__IPU_DISPB_DAT_9,
+       MX35_PAD_LD10__IPU_DISPB_DAT_10,
+       MX35_PAD_LD11__IPU_DISPB_DAT_11,
+       MX35_PAD_LD12__IPU_DISPB_DAT_12,
+       MX35_PAD_LD13__IPU_DISPB_DAT_13,
+       MX35_PAD_LD14__IPU_DISPB_DAT_14,
+       MX35_PAD_LD15__IPU_DISPB_DAT_15,
+       MX35_PAD_LD16__IPU_DISPB_DAT_16,
+       MX35_PAD_LD17__IPU_DISPB_DAT_17,
+       MX35_PAD_D3_HSYNC__IPU_DISPB_D3_HSYNC,
+       MX35_PAD_D3_FPSHIFT__IPU_DISPB_D3_CLK,
+       MX35_PAD_D3_DRDY__IPU_DISPB_D3_DRDY,
+       MX35_PAD_CONTRAST__IPU_DISPB_CONTR,
+       MX35_PAD_D3_VSYNC__IPU_DISPB_D3_VSYNC,
+       MX35_PAD_D3_REV__IPU_DISPB_D3_REV,
+       MX35_PAD_D3_CLS__IPU_DISPB_D3_CLS,
+       /* CSI */
+       MX35_PAD_TX1__IPU_CSI_D_6,
+       MX35_PAD_TX0__IPU_CSI_D_7,
+       MX35_PAD_CSI_D8__IPU_CSI_D_8,
+       MX35_PAD_CSI_D9__IPU_CSI_D_9,
+       MX35_PAD_CSI_D10__IPU_CSI_D_10,
+       MX35_PAD_CSI_D11__IPU_CSI_D_11,
+       MX35_PAD_CSI_D12__IPU_CSI_D_12,
+       MX35_PAD_CSI_D13__IPU_CSI_D_13,
+       MX35_PAD_CSI_D14__IPU_CSI_D_14,
+       MX35_PAD_CSI_D15__IPU_CSI_D_15,
+       MX35_PAD_CSI_HSYNC__IPU_CSI_HSYNC,
+       MX35_PAD_CSI_MCLK__IPU_CSI_MCLK,
+       MX35_PAD_CSI_PIXCLK__IPU_CSI_PIXCLK,
+       MX35_PAD_CSI_VSYNC__IPU_CSI_VSYNC,
+       /*PMIC IRQ*/
+       MX35_PAD_GPIO2_0__GPIO2_0,
+};
+
+/*
+ * Camera support
+*/
+static phys_addr_t mx3_camera_base __initdata;
+#define MX35_3DS_CAMERA_BUF_SIZE SZ_8M
+
+static const struct mx3_camera_pdata mx35_3ds_camera_pdata __initconst = {
+       .flags = MX3_CAMERA_DATAWIDTH_8,
+       .mclk_10khz = 2000,
+};
+
+static int __init imx35_3ds_init_camera(void)
+{
+       int dma, ret = -ENOMEM;
+       struct platform_device *pdev =
+               imx35_alloc_mx3_camera(&mx35_3ds_camera_pdata);
+
+       if (IS_ERR(pdev))
+               return PTR_ERR(pdev);
+
+       if (!mx3_camera_base)
+               goto err;
+
+       dma = dma_declare_coherent_memory(&pdev->dev,
+                                       mx3_camera_base, mx3_camera_base,
+                                       MX35_3DS_CAMERA_BUF_SIZE,
+                                       DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE);
+
+       if (!(dma & DMA_MEMORY_MAP))
+               goto err;
+
+       ret = platform_device_add(pdev);
+       if (ret)
+err:
+               platform_device_put(pdev);
+
+       return ret;
+}
+
+static struct i2c_board_info mx35_3ds_i2c_camera = {
+       I2C_BOARD_INFO("ov2640", 0x30),
+};
+
+static struct soc_camera_link iclink_ov2640 = {
+       .bus_id         = 0,
+       .board_info     = &mx35_3ds_i2c_camera,
+       .i2c_adapter_id = 0,
+       .power          = NULL,
+};
+
+static struct platform_device mx35_3ds_ov2640 = {
+       .name   = "soc-camera-pdrv",
+       .id     = 0,
+       .dev    = {
+               .platform_data = &iclink_ov2640,
+       },
+};
+
+static struct regulator_consumer_supply sw1_consumers[] = {
+       {
+               .supply = "cpu_vcc",
+       }
+};
+
+static struct regulator_consumer_supply vcam_consumers[] = {
+       /* sgtl5000 */
+       REGULATOR_SUPPLY("VDDA", "0-000a"),
+};
+
+static struct regulator_consumer_supply vaudio_consumers[] = {
+       REGULATOR_SUPPLY("cmos_vio", "soc-camera-pdrv.0"),
+};
+
+static struct regulator_init_data sw1_init = {
+       .constraints = {
+               .name = "SW1",
+               .min_uV = 600000,
+               .max_uV = 1375000,
+               .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE,
+               .valid_modes_mask = 0,
+               .always_on = 1,
+               .boot_on = 1,
+       },
+       .num_consumer_supplies = ARRAY_SIZE(sw1_consumers),
+       .consumer_supplies = sw1_consumers,
+};
+
+static struct regulator_init_data sw2_init = {
+       .constraints = {
+               .name = "SW2",
+               .always_on = 1,
+               .boot_on = 1,
+       }
 };
 
+static struct regulator_init_data sw3_init = {
+       .constraints = {
+               .name = "SW3",
+               .always_on = 1,
+               .boot_on = 1,
+       }
+};
+
+static struct regulator_init_data sw4_init = {
+       .constraints = {
+               .name = "SW4",
+               .always_on = 1,
+               .boot_on = 1,
+       }
+};
+
+static struct regulator_init_data viohi_init = {
+       .constraints = {
+               .name = "VIOHI",
+               .boot_on = 1,
+       }
+};
+
+static struct regulator_init_data vusb_init = {
+       .constraints = {
+               .name = "VUSB",
+               .boot_on = 1,
+       }
+};
+
+static struct regulator_init_data vdig_init = {
+       .constraints = {
+               .name = "VDIG",
+               .boot_on = 1,
+       }
+};
+
+static struct regulator_init_data vpll_init = {
+       .constraints = {
+               .name = "VPLL",
+               .boot_on = 1,
+       }
+};
+
+static struct regulator_init_data vusb2_init = {
+       .constraints = {
+               .name = "VUSB2",
+               .boot_on = 1,
+       }
+};
+
+static struct regulator_init_data vvideo_init = {
+       .constraints = {
+               .name = "VVIDEO",
+               .boot_on = 1
+       }
+};
+
+static struct regulator_init_data vaudio_init = {
+       .constraints = {
+               .name = "VAUDIO",
+               .min_uV = 2300000,
+               .max_uV = 3000000,
+               .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE,
+               .boot_on = 1
+       },
+       .num_consumer_supplies = ARRAY_SIZE(vaudio_consumers),
+       .consumer_supplies = vaudio_consumers,
+};
+
+static struct regulator_init_data vcam_init = {
+       .constraints = {
+               .name = "VCAM",
+               .min_uV = 2500000,
+               .max_uV = 3000000,
+               .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
+                                       REGULATOR_CHANGE_MODE,
+               .valid_modes_mask = REGULATOR_MODE_FAST | REGULATOR_MODE_NORMAL,
+               .boot_on = 1
+       },
+       .num_consumer_supplies = ARRAY_SIZE(vcam_consumers),
+       .consumer_supplies = vcam_consumers,
+};
+
+static struct regulator_init_data vgen1_init = {
+       .constraints = {
+               .name = "VGEN1",
+       }
+};
+
+static struct regulator_init_data vgen2_init = {
+       .constraints = {
+               .name = "VGEN2",
+               .boot_on = 1,
+       }
+};
+
+static struct regulator_init_data vgen3_init = {
+       .constraints = {
+               .name = "VGEN3",
+       }
+};
+
+static struct mc13xxx_regulator_init_data mx35_3ds_regulators[] = {
+       { .id = MC13892_SW1, .init_data = &sw1_init },
+       { .id = MC13892_SW2, .init_data = &sw2_init },
+       { .id = MC13892_SW3, .init_data = &sw3_init },
+       { .id = MC13892_SW4, .init_data = &sw4_init },
+       { .id = MC13892_VIOHI, .init_data = &viohi_init },
+       { .id = MC13892_VPLL, .init_data = &vpll_init },
+       { .id = MC13892_VDIG, .init_data = &vdig_init },
+       { .id = MC13892_VUSB2, .init_data = &vusb2_init },
+       { .id = MC13892_VVIDEO, .init_data = &vvideo_init },
+       { .id = MC13892_VAUDIO, .init_data = &vaudio_init },
+       { .id = MC13892_VCAM, .init_data = &vcam_init },
+       { .id = MC13892_VGEN1, .init_data = &vgen1_init },
+       { .id = MC13892_VGEN2, .init_data = &vgen2_init },
+       { .id = MC13892_VGEN3, .init_data = &vgen3_init },
+       { .id = MC13892_VUSB, .init_data = &vusb_init },
+};
+
+static struct mc13xxx_platform_data mx35_3ds_mc13892_data = {
+       .flags = MC13XXX_USE_RTC | MC13XXX_USE_TOUCHSCREEN,
+       .regulators = {
+               .num_regulators = ARRAY_SIZE(mx35_3ds_regulators),
+               .regulators = mx35_3ds_regulators,
+       },
+};
+
+#define GPIO_PMIC_INT IMX_GPIO_NR(2, 0)
+
+static struct i2c_board_info mx35_3ds_i2c_mc13892 = {
+
+       I2C_BOARD_INFO("mc13892", 0x08),
+       .platform_data = &mx35_3ds_mc13892_data,
+       /* irq number is run-time assigned */
+};
+
+static void __init imx35_3ds_init_mc13892(void)
+{
+       int ret = gpio_request_one(GPIO_PMIC_INT, GPIOF_DIR_IN, "pmic irq");
+
+       if (ret) {
+               pr_err("failed to get pmic irq: %d\n", ret);
+               return;
+       }
+
+       mx35_3ds_i2c_mc13892.irq = gpio_to_irq(GPIO_PMIC_INT);
+       i2c_register_board_info(0, &mx35_3ds_i2c_mc13892, 1);
+}
+
 static int mx35_3ds_otg_init(struct platform_device *pdev)
 {
        return mx35_initialize_usb_hw(pdev->id, MXC_EHCI_INTERNAL_PHY);
@@ -155,18 +530,18 @@ static const struct mxc_usbh_platform_data usb_host_pdata __initconst = {
        .portsc         = MXC_EHCI_MODE_SERIAL,
 };
 
-static int otg_mode_host;
+static bool otg_mode_host __initdata;
 
 static int __init mx35_3ds_otg_mode(char *options)
 {
        if (!strcmp(options, "host"))
-               otg_mode_host = 1;
+               otg_mode_host = true;
        else if (!strcmp(options, "device"))
-               otg_mode_host = 0;
+               otg_mode_host = false;
        else
                pr_info("otg_mode neither \"host\" nor \"device\". "
                        "Defaulting to device\n");
-       return 0;
+       return 1;
 }
 __setup("otg_mode=", mx35_3ds_otg_mode);
 
@@ -179,12 +554,15 @@ static const struct imxi2c_platform_data mx35_3ds_i2c0_data __initconst = {
  */
 static void __init mx35_3ds_init(void)
 {
+       struct platform_device *imx35_fb_pdev;
+
        imx35_soc_init();
 
        mxc_iomux_v3_setup_multiple_pads(mx35pdk_pads, ARRAY_SIZE(mx35pdk_pads));
 
        imx35_add_fec(NULL);
-       imx35_add_imx2_wdt(NULL);
+       imx35_add_imx2_wdt();
+       imx35_add_mxc_rtc();
        platform_add_devices(devices, ARRAY_SIZE(devices));
 
        imx35_add_imx_uart0(&uart_pdata);
@@ -200,10 +578,23 @@ static void __init mx35_3ds_init(void)
        imx35_add_mxc_nand(&mx35pdk_nand_board_info);
        imx35_add_sdhci_esdhc_imx(0, NULL);
 
-       if (mxc_expio_init(MX35_CS5_BASE_ADDR, EXPIO_PARENT_INT))
+       if (mxc_expio_init(MX35_CS5_BASE_ADDR, IMX_GPIO_NR(1, 1)))
                pr_warn("Init of the debugboard failed, all "
                                "devices on the debugboard are unusable.\n");
        imx35_add_imx_i2c0(&mx35_3ds_i2c0_data);
+
+       i2c_register_board_info(
+               0, i2c_devices_3ds, ARRAY_SIZE(i2c_devices_3ds));
+
+       imx35_add_ipu_core();
+       platform_device_register(&mx35_3ds_ov2640);
+       imx35_3ds_init_camera();
+
+       imx35_fb_pdev = imx35_add_mx3_sdc_fb(&mx3fb_pdata);
+       mx35_3ds_lcd.dev.parent = &imx35_fb_pdev->dev;
+       platform_device_register(&mx35_3ds_lcd);
+
+       imx35_3ds_init_mc13892();
 }
 
 static void __init mx35pdk_timer_init(void)
@@ -211,16 +602,22 @@ static void __init mx35pdk_timer_init(void)
        mx35_clocks_init();
 }
 
-struct sys_timer mx35pdk_timer = {
-       .init   = mx35pdk_timer_init,
-};
+static void __init mx35_3ds_reserve(void)
+{
+       /* reserve MX35_3DS_CAMERA_BUF_SIZE bytes for mx3-camera */
+       mx3_camera_base = arm_memblock_steal(MX35_3DS_CAMERA_BUF_SIZE,
+                                        MX35_3DS_CAMERA_BUF_SIZE);
+}
 
 MACHINE_START(MX35_3DS, "Freescale MX35PDK")
        /* Maintainer: Freescale Semiconductor, Inc */
-       .boot_params = MX3x_PHYS_OFFSET + 0x100,
+       .atag_offset = 0x100,
        .map_io = mx35_map_io,
        .init_early = imx35_init_early,
        .init_irq = mx35_init_irq,
-       .timer = &mx35pdk_timer,
+       .handle_irq = imx35_handle_irq,
+       .init_time      = mx35pdk_timer_init,
        .init_machine = mx35_3ds_init,
+       .reserve = mx35_3ds_reserve,
+       .restart        = mxc_restart,
 MACHINE_END