]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - arch/arm/mach-omap2/board-3430sdp.c
Remove extra code in arch/arm/*omap* to move it into omap-pool branch
[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / board-3430sdp.c
index 03acac79adfc730cb697d1d4dcff29312c48fc2d..ed9274972122e782fcc1d94b2570f82f2b0733fb 100644 (file)
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/input.h>
-#include <linux/err.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
 #include <linux/i2c/twl4030.h>
 #include <linux/regulator/machine.h>
 #include <linux/io.h>
+#include <linux/gpio.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
@@ -30,7 +30,6 @@
 #include <asm/mach/map.h>
 
 #include <mach/mcspi.h>
-#include <mach/gpio.h>
 #include <mach/mux.h>
 #include <mach/board.h>
 #include <mach/usb.h>
 #include <mach/gpmc.h>
 
 #include <mach/control.h>
+#include <mach/keypad.h>
 
-#include "sdram-qimonda-hyb18m512160af-6.h"
 #include "mmc-twl4030.h"
 
 #define CONFIG_DISABLE_HFCLK 1
 
-#define SDP3430_ETHR_START             DEBUG_BASE
 #define SDP3430_ETHR_GPIO_IRQ_SDPV1    29
 #define SDP3430_ETHR_GPIO_IRQ_SDPV2    6
 #define SDP3430_SMC91X_CS              3
 #define ENABLE_VAUX3_DEDICATED 0x03
 #define ENABLE_VAUX3_DEV_GRP   0x20
 
-#define ENABLE_VAUX3_DEDICATED 0x03
-#define ENABLE_VAUX3_DEV_GRP   0x20
-
 #define TWL4030_MSECURE_GPIO 22
 
-extern void sdp3430_flash_init(void);
-
 static struct resource sdp3430_smc91x_resources[] = {
        [0] = {
                .flags  = IORESOURCE_MEM,
@@ -125,42 +118,6 @@ static struct twl4030_keypad_data sdp3430_kp_data = {
 
 static int ts_gpio;    /* Needed for ads7846_get_pendown_state */
 
-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 &&
-                       omap_rev() < OMAP3430_REV_ES2_0) {
-               void __iomem *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 = __raw_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 */
-               __raw_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
  *
@@ -184,42 +141,9 @@ static int ads7846_get_pendown_state(void)
        return !gpio_get_value(ts_gpio);
 }
 
-/*
- * This enable(1)/disable(0) the voltage for TS: uses twl4030 calls
- */
-static int ads7846_vaux_control(int vaux_cntrl)
-{
-       int ret = 0;
-
-       /* FIXME use regulator calls */
-
-#ifdef CONFIG_TWL4030_CORE
-       /* check for return value of ldo_use: if success it returns 0 */
-       if (vaux_cntrl == VAUX_ENABLE) {
-               if (ret != twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
-                       ENABLE_VAUX3_DEDICATED, TWL4030_VAUX3_DEDICATED))
-                       return -EIO;
-               if (ret != twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
-                       ENABLE_VAUX3_DEV_GRP, TWL4030_VAUX3_DEV_GRP))
-                       return -EIO;
-       } else if (vaux_cntrl == VAUX_DISABLE) {
-               if (ret != twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
-                       0x00, TWL4030_VAUX3_DEDICATED))
-                       return -EIO;
-               if (ret != twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
-                       0x00, TWL4030_VAUX3_DEV_GRP))
-                       return -EIO;
-       }
-#else
-       ret = -EIO;
-#endif
-       return ret;
-}
-
 static struct ads7846_platform_data tsc2046_config __initdata = {
        .get_pendown_state      = ads7846_get_pendown_state,
        .keep_vref_on           = 1,
-       .vaux_control           = ads7846_vaux_control,
 };
 
 
@@ -298,7 +222,7 @@ static inline void __init sdp3430_init_smc91x(void)
 
 static void __init omap_3430sdp_init_irq(void)
 {
-       omap2_init_common_hw(hyb18m512160af6_sdrc_params);
+       omap2_init_common_hw(NULL);
        omap_init_irq();
        omap_gpio_init();
        sdp3430_init_smc91x();
@@ -407,87 +331,6 @@ static struct twl4030_madc_platform_data sdp3430_madc_data = {
        .irq_line       = 1,
 };
 
-
-static struct twl4030_ins __initdata sleep_on_seq[] = {
-/*
- * Turn off VDD1 and VDD2.
- */
-       {MSG_SINGULAR(DEV_GRP_P1, 0xf, RES_STATE_OFF), 4},
-       {MSG_SINGULAR(DEV_GRP_P1, 0x10, RES_STATE_OFF), 2},
-#ifdef CONFIG_DISABLE_HFCLK
-/*
- * And also turn off the OMAP3 PLLs and the sysclk output.
- */
-       {MSG_SINGULAR(DEV_GRP_P1, 0x7, RES_STATE_OFF), 3},
-       {MSG_SINGULAR(DEV_GRP_P1, 0x19, RES_STATE_OFF), 3},
-#endif
-};
-
-static struct twl4030_script sleep_on_script __initdata = {
-       .script = sleep_on_seq,
-       .size   = ARRAY_SIZE(sleep_on_seq),
-       .flags  = TRITON_SLEEP_SCRIPT,
-};
-
-static struct twl4030_ins wakeup_seq[] __initdata = {
-#ifndef CONFIG_DISABLE_HFCLK
-/*
- * Wakeup VDD1 and VDD2.
- */
-       {MSG_SINGULAR(DEV_GRP_P1, 0xf, RES_STATE_ACTIVE), 4},
-       {MSG_SINGULAR(DEV_GRP_P1, 0x10, RES_STATE_ACTIVE), 2},
-#else
-/*
- * Reenable the OMAP3 PLLs.
- * Wakeup VDD1 and VDD2.
- * Reenable sysclk output.
- */
-       {MSG_SINGULAR(DEV_GRP_P1, 0x7, RES_STATE_ACTIVE), 0x30},
-       {MSG_SINGULAR(DEV_GRP_P1, 0xf, RES_STATE_ACTIVE), 0x30},
-       {MSG_SINGULAR(DEV_GRP_P1, 0x10, RES_STATE_ACTIVE), 0x37},
-       {MSG_SINGULAR(DEV_GRP_P1, 0x19, RES_STATE_ACTIVE), 3},
-#endif /* #ifndef CONFIG_DISABLE_HFCLK */
-};
-
-static struct twl4030_script wakeup_script __initdata = {
-       .script = wakeup_seq,
-       .size   = ARRAY_SIZE(wakeup_seq),
-       .flags  = TRITON_WAKEUP12_SCRIPT | TRITON_WAKEUP3_SCRIPT,
-};
-
-static struct twl4030_ins wrst_seq[] __initdata = {
-/*
- * Reset twl4030.
- * Reset VDD1 regulator.
- * Reset VDD2 regulator.
- * Reset VPLL1 regulator.
- * Enable sysclk output.
- * Reenable twl4030.
- */
-       {MSG_SINGULAR(DEV_GRP_NULL, 0x1b, RES_STATE_OFF), 2},
-       {MSG_SINGULAR(DEV_GRP_P1, 0xf, RES_STATE_WRST), 15},
-       {MSG_SINGULAR(DEV_GRP_P1, 0x10, RES_STATE_WRST), 15},
-       {MSG_SINGULAR(DEV_GRP_P1, 0x7, RES_STATE_WRST), 0x60},
-       {MSG_SINGULAR(DEV_GRP_P1, 0x19, RES_STATE_ACTIVE), 2},
-       {MSG_SINGULAR(DEV_GRP_NULL, 0x1b, RES_STATE_ACTIVE), 2},
-};
-static struct twl4030_script wrst_script __initdata = {
-       .script = wrst_seq,
-       .size   = ARRAY_SIZE(wakeup_seq),
-       .flags  = TRITON_WRST_SCRIPT,
-};
-
-static struct twl4030_script *twl4030_scripts[] __initdata = {
-       &sleep_on_script,
-       &wakeup_script,
-       &wrst_script,
-};
-
-static struct twl4030_power_data sdp3430_t2scripts_data __initdata = {
-       .scripts        = twl4030_scripts,
-       .size           = ARRAY_SIZE(twl4030_scripts),
-};
-
 /*
  * Apply all the fixed voltages since most versions of U-Boot
  * don't bother with that initialization.
@@ -629,7 +472,6 @@ static struct twl4030_platform_data sdp3430_twldata = {
        .gpio           = &sdp3430_gpio_data,
        .madc           = &sdp3430_madc_data,
        .keypad         = &sdp3430_kp_data,
-       .power          = &sdp3430_t2scripts_data,
        .usb            = &sdp3430_usb_data,
 
        .vaux1          = &sdp3430_vaux1,
@@ -678,11 +520,8 @@ static void __init omap_3430sdp_init(void)
        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();
        usb_musb_init();
-       usb_ehci_init();
 }
 
 static void __init omap_3430sdp_map_io(void)