]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - arch/arm/mach-omap2/board-3430sdp.c
ARM: OMAP3: Remove include of removed twl4030-rtc.h
[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / board-3430sdp.c
index fc5ca4e101d18778ffecb37363220e18ac79e7c1..56f28ae94d6f8e0b61ed55b1a5b9af214c42867e 100644 (file)
@@ -15,8 +15,6 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
 #include <linux/delay.h>
 #include <linux/input.h>
 #include <linux/workqueue.h>
 #include <linux/clk.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
+#include <linux/i2c/twl4030.h>
 
-#include <asm/hardware.h>
+#include <mach/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/twl4030.h>
-#include <asm/arch/mcspi.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/board.h>
-#include <asm/arch/common.h>
-#include <asm/arch/keypad.h>
-#include <asm/arch/dma.h>
-#include <asm/arch/gpmc.h>
+
+#include <mach/mcspi.h>
+#include <mach/gpio.h>
+#include <mach/mux.h>
+#include <mach/board.h>
+#include <mach/usb-musb.h>
+#include <mach/usb-ehci.h>
+#include <mach/hsmmc.h>
+#include <mach/common.h>
+#include <mach/keypad.h>
+#include <mach/dma.h>
+#include <mach/gpmc.h>
 
 #include <asm/io.h>
 #include <asm/delay.h>
+#include <mach/control.h>
+
+#include "sdram-qimonda-hyb18m512160af-6.h"
 
-#define        SDP3430_FLASH_CS        0
 #define        SDP3430_SMC91X_CS       3
 
 #define ENABLE_VAUX3_DEDICATED 0x03
 #define ENABLE_VAUX3_DEV_GRP   0x20
 
-static struct mtd_partition sdp3430_partitions[] = {
-       /* bootloader (U-Boot, etc) in first sector */
-       {
-                 .name         = "bootloader",
-                 .offset               = 0,
-                 .size         = SZ_256K,
-                 .mask_flags   = MTD_WRITEABLE, /* force read-only */
-       },
-       /* bootloader params in the next sector */
-       {
-                 .name         = "params",
-                 .offset               = MTDPART_OFS_APPEND,
-                 .size         = SZ_128K,
-                 .mask_flags   = 0,
-       },
-       /* kernel */
-       {
-                 .name         = "kernel",
-                 .offset               = MTDPART_OFS_APPEND,
-                 .size         = SZ_2M,
-                 .mask_flags   = 0
-       },
-       /* file system */
-       {
-                 .name         = "filesystem",
-                 .offset               = MTDPART_OFS_APPEND,
-                 .size         = MTDPART_SIZ_FULL,
-                 .mask_flags   = 0
-       }
-};
-
-static struct flash_platform_data sdp3430_flash_data = {
-       .map_name       = "cfi_probe",
-       .width          = 2,
-       .parts          = sdp3430_partitions,
-       .nr_parts       = ARRAY_SIZE(sdp3430_partitions),
-};
-
-static struct resource sdp3430_flash_resource = {
-       .start          = FLASH_BASE,
-       .end            = FLASH_BASE + SZ_64M - 1,
-       .flags          = IORESOURCE_MEM,
-};
 
-static struct platform_device sdp3430_flash_device = {
-       .name           = "omapflash",
-       .id             = 0,
-       .dev            = {
-               .platform_data  = &sdp3430_flash_data,
-       },
-       .num_resources  = 1,
-       .resource       = &sdp3430_flash_resource,
-};
+#define TWL4030_MSECURE_GPIO 22
 
 static struct resource sdp3430_smc91x_resources[] = {
        [0] = {
                .start  = OMAP34XX_ETHR_START,
                .end    = OMAP34XX_ETHR_START + SZ_4K,
-               .flags          = IORESOURCE_MEM,
+               .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start          = OMAP_GPIO_IRQ(OMAP34XX_ETHR_GPIO_IRQ),
+               .start  = 0,
                .end    = 0,
-               .flags          = IORESOURCE_IRQ,
+               .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
        },
 };
 
@@ -158,21 +109,51 @@ static int sdp3430_keymap[] = {
        0
 };
 
-static struct omap_kp_platform_data sdp3430_kp_data = {
+static struct twl4030_keypad_data sdp3430_kp_data = {
        .rows           = 5,
        .cols           = 6,
-       .keymap         = sdp3430_keymap,
-       .keymapsize     = ARRAY_SIZE(sdp3430_keymap),
+       .keymap         = sdp3430_keymap,
+       .keymapsize     = ARRAY_SIZE(sdp3430_keymap),
        .rep            = 1,
+       .irq            = TWL4030_MODIRQ_KEYPAD,
 };
 
-static struct platform_device sdp3430_kp_device = {
-       .name           = "omap_twl4030keypad",
-       .id             = -1,
-       .dev            = {
-               .platform_data  = &sdp3430_kp_data,
-       },
-};
+static int ts_gpio;
+
+static int __init msecure_init(void)
+{
+       int ret = 0;
+
+#ifdef CONFIG_RTC_DRV_TWL4030
+       /* 3430ES2.0 doesn't have msecure/gpio-22 line connected to T2 */
+       if (omap_type() == OMAP2_DEVICE_TYPE_GP &&
+                       system_rev < OMAP3430_REV_ES2_0) {
+               u32 msecure_pad_config_reg = omap_ctrl_base_get() + 0xA3C;
+               int mux_mask = 0x04;
+               u16 tmp;
+
+               ret = gpio_request(TWL4030_MSECURE_GPIO, "msecure");
+               if (ret < 0) {
+                       printk(KERN_ERR "msecure_init: can't"
+                               "reserve GPIO:%d !\n", TWL4030_MSECURE_GPIO);
+                       goto out;
+               }
+               /*
+                * TWL4030 will be in secure mode if msecure line from OMAP
+                * is low. Make msecure line high in order to change the
+                * TWL4030 RTC time and calender registers.
+                */
+               tmp = omap_readw(msecure_pad_config_reg);
+               tmp &= 0xF8; /* To enable mux mode 03/04 = GPIO_RTC */
+               tmp |= mux_mask;/* To enable mux mode 03/04 = GPIO_RTC */
+               omap_writew(tmp, msecure_pad_config_reg);
+
+               gpio_direction_output(TWL4030_MSECURE_GPIO, 1);
+       }
+out:
+#endif
+       return ret;
+}
 
 /**
  * @brief ads7846_dev_init : Requests & sets GPIO line for pen-irq
@@ -181,20 +162,20 @@ static struct platform_device sdp3430_kp_device = {
  */
 static void ads7846_dev_init(void)
 {
-       if (omap_request_gpio(TS_GPIO) < 0) {
+       if (omap_request_gpio(ts_gpio) < 0) {
                printk(KERN_ERR "can't get ads746 pen down GPIO\n");
                return;
        }
 
-       omap_set_gpio_direction(TS_GPIO, 1);
+       omap_set_gpio_direction(ts_gpio, 1);
 
-       omap_set_gpio_debounce(TS_GPIO, 1);
-       omap_set_gpio_debounce_time(TS_GPIO, 0xa);
+       omap_set_gpio_debounce(ts_gpio, 1);
+       omap_set_gpio_debounce_time(ts_gpio, 0xa);
 }
 
 static int ads7846_get_pendown_state(void)
 {
-       return !omap_get_gpio_datain(TS_GPIO);
+       return !omap_get_gpio_datain(ts_gpio);
 }
 
 /*
@@ -250,7 +231,7 @@ static struct spi_board_info sdp3430_spi_board_info[] __initdata = {
                .chip_select            = 0,
                .max_speed_hz           = 1500000,
                .controller_data        = &tsc2046_mcspi_config,
-               .irq                    = OMAP_GPIO_IRQ(TS_GPIO),
+               .irq                    = 0,
                .platform_data          = &tsc2046_config,
        },
 };
@@ -262,8 +243,6 @@ static struct platform_device sdp3430_lcd_device = {
 
 static struct platform_device *sdp3430_devices[] __initdata = {
        &sdp3430_smc91x_device,
-       &sdp3430_flash_device,
-       &sdp3430_kp_device,
        &sdp3430_lcd_device,
 };
 
@@ -271,8 +250,9 @@ static inline void __init sdp3430_init_smc91x(void)
 {
        int eth_cs;
        unsigned long cs_mem_base;
+       int eth_gpio = 0;
 
-       eth_cs  = SDP3430_SMC91X_CS;
+       eth_cs = SDP3430_SMC91X_CS;
 
        if (gpmc_cs_request(eth_cs, SZ_16M, &cs_mem_base) < 0) {
                printk(KERN_ERR "Failed to request GPMC mem for smc91x\n");
@@ -283,17 +263,24 @@ static inline void __init sdp3430_init_smc91x(void)
        sdp3430_smc91x_resources[0].end   = cs_mem_base + 0xf;
        udelay(100);
 
-       if (omap_request_gpio(OMAP34XX_ETHR_GPIO_IRQ) < 0) {
+       if (system_rev > OMAP3430_REV_ES1_0)
+               eth_gpio = OMAP34XX_ETHR_GPIO_IRQ_SDPV2;
+       else
+               eth_gpio = OMAP34XX_ETHR_GPIO_IRQ_SDPV1;
+
+       sdp3430_smc91x_resources[1].start = OMAP_GPIO_IRQ(eth_gpio);
+
+       if (omap_request_gpio(eth_gpio) < 0) {
                printk(KERN_ERR "Failed to request GPIO%d for smc91x IRQ\n",
-                       OMAP34XX_ETHR_GPIO_IRQ);
+                       eth_gpio);
                return;
        }
-       omap_set_gpio_direction(OMAP34XX_ETHR_GPIO_IRQ, 1);
+       omap_set_gpio_direction(eth_gpio, 1);
 }
 
 static void __init omap_3430sdp_init_irq(void)
 {
-       omap2_init_common_hw();
+       omap2_init_common_hw(hyb18m512160af6_sdrc_params);
        omap_init_irq();
        omap_gpio_init();
        sdp3430_init_smc91x();
@@ -309,27 +296,91 @@ static struct omap_lcd_config sdp3430_lcd_config __initdata = {
 
 static struct omap_board_config_kernel sdp3430_config[] __initdata = {
        { OMAP_TAG_UART,        &sdp3430_uart_config },
-       {OMAP_TAG_LCD,          &sdp3430_lcd_config},
+       { OMAP_TAG_LCD,         &sdp3430_lcd_config },
+};
+
+static int sdp3430_batt_table[] = {
+/* 0 C*/
+30800, 29500, 28300, 27100,
+26000, 24900, 23900, 22900, 22000, 21100, 20300, 19400, 18700, 17900,
+17200, 16500, 15900, 15300, 14700, 14100, 13600, 13100, 12600, 12100,
+11600, 11200, 10800, 10400, 10000, 9630,   9280,   8950,   8620,   8310,
+8020,   7730,   7460,   7200,   6950,   6710,   6470,   6250,   6040,   5830,
+5640,   5450,   5260,   5090,   4920,   4760,   4600,   4450,   4310,   4170,
+4040,   3910,   3790,   3670,   3550
+};
+
+static struct twl4030_bci_platform_data sdp3430_bci_data = {
+      .battery_tmp_tbl = sdp3430_batt_table,
+      .tblsize         = ARRAY_SIZE(sdp3430_batt_table),
+};
+
+static struct twl4030_gpio_platform_data sdp3430_gpio_data = {
+       .gpio_base      = OMAP_MAX_GPIO_LINES,
+       .irq_base       = TWL4030_GPIO_IRQ_BASE,
+       .irq_end        = TWL4030_GPIO_IRQ_END,
+};
+
+static struct twl4030_usb_data sdp3430_usb_data = {
+       .usb_mode       = T2_USB_MODE_ULPI,
+};
+
+static struct twl4030_madc_platform_data sdp3430_madc_data = {
+       .irq_line       = 1,
+};
+
+static struct twl4030_platform_data sdp3430_twldata = {
+       .irq_base       = TWL4030_IRQ_BASE,
+       .irq_end        = TWL4030_IRQ_END,
+
+       /* platform_data for children goes here */
+       .bci            = &sdp3430_bci_data,
+       .gpio           = &sdp3430_gpio_data,
+       .madc           = &sdp3430_madc_data,
+       .keypad         = &sdp3430_kp_data,
+       .usb            = &sdp3430_usb_data,
+};
+
+static struct i2c_board_info __initdata sdp3430_i2c_boardinfo[] = {
+       {
+               I2C_BOARD_INFO("twl4030", 0x48),
+               .flags = I2C_CLIENT_WAKE,
+               .irq = INT_34XX_SYS_NIRQ,
+               .platform_data = &sdp3430_twldata,
+       },
 };
 
 static int __init omap3430_i2c_init(void)
 {
-       omap_register_i2c_bus(1, 2600, NULL, 0);
+       omap_register_i2c_bus(1, 2600, sdp3430_i2c_boardinfo,
+                       ARRAY_SIZE(sdp3430_i2c_boardinfo));
        omap_register_i2c_bus(2, 400, NULL, 0);
        omap_register_i2c_bus(3, 400, NULL, 0);
        return 0;
 }
 
+extern void __init sdp3430_flash_init(void);
+
 static void __init omap_3430sdp_init(void)
 {
+       omap3430_i2c_init();
        platform_add_devices(sdp3430_devices, ARRAY_SIZE(sdp3430_devices));
        omap_board_config = sdp3430_config;
        omap_board_config_size = ARRAY_SIZE(sdp3430_config);
+       if (system_rev > OMAP3430_REV_ES1_0)
+               ts_gpio = OMAP34XX_TS_GPIO_IRQ_SDPV2;
+       else
+               ts_gpio = OMAP34XX_TS_GPIO_IRQ_SDPV1;
+       sdp3430_spi_board_info[0].irq = OMAP_GPIO_IRQ(ts_gpio);
        spi_register_board_info(sdp3430_spi_board_info,
                                ARRAY_SIZE(sdp3430_spi_board_info));
        ads7846_dev_init();
+       sdp3430_flash_init();
+       msecure_init();
        omap_serial_init();
-       sdp3430_usb_init();
+       usb_musb_init();
+       usb_ehci_init();
+       hsmmc_init();
 }
 
 static void __init omap_3430sdp_map_io(void)
@@ -337,7 +388,6 @@ static void __init omap_3430sdp_map_io(void)
        omap2_set_globals_343x();
        omap2_map_common_io();
 }
-arch_initcall(omap3430_i2c_init);
 
 MACHINE_START(OMAP_3430SDP, "OMAP3430 3430SDP board")
        /* Maintainer: Syed Khasim - Texas Instruments Inc */