#include <mach/mux.h>
#include <mach/board.h>
#include <mach/usb-musb.h>
-#include <mach/mmc.h>
#include <mach/common.h>
#include <mach/keypad.h>
#include <mach/gpmc.h>
.keymap = sdp2430_keymap,
.keymapsize = ARRAY_SIZE(sdp2430_keymap),
.rep = 1,
- .irq = TWL4030_MODIRQ_KEYPAD,
};
static int __init msecure_init(void)
static void ads7846_dev_init(void)
{
- if (omap_request_gpio(TS_GPIO) < 0)
+ if (gpio_request(TS_GPIO, "ads7846 irq") < 0)
printk(KERN_ERR "can't get ads746 pen down GPIO\n");
- omap_set_gpio_direction(TS_GPIO, 1);
+ gpio_direction_input(TS_GPIO);
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 !gpio_get_value(TS_GPIO);
}
static struct ads7846_platform_data tsc2046_config __initdata = {
sdp2430_smc91x_resources[0].end = cs_mem_base + 0x30f;
udelay(100);
- if (omap_request_gpio(OMAP24XX_ETHR_GPIO_IRQ) < 0) {
+ if (gpio_request(OMAP24XX_ETHR_GPIO_IRQ, "SMC91x irq") < 0) {
printk(KERN_ERR "Failed to request GPIO%d for smc91x IRQ\n",
OMAP24XX_ETHR_GPIO_IRQ);
gpmc_cs_free(eth_cs);
goto out;
}
- omap_set_gpio_direction(OMAP24XX_ETHR_GPIO_IRQ, 1);
+ gpio_direction_input(OMAP24XX_ETHR_GPIO_IRQ);
out:
clk_disable(gpmc_fck);
.mmc = 1,
.wires = 4,
.gpio_cd = -EINVAL,
+ .gpio_wp = -EINVAL,
+ .ext_clock = 1,
},
{} /* Terminator */
};
spi_register_board_info(sdp2430_spi_board_info,
ARRAY_SIZE(sdp2430_spi_board_info));
ads7846_dev_init();
- hsmmc_init(mmc);
+ twl4030_mmc_init(mmc);
/* turn off secondary LCD backlight */
- omap_set_gpio_direction(SECONDARY_LCD_GPIO, 0);
- omap_set_gpio_dataout(SECONDARY_LCD_GPIO, 0);
+ gpio_direction_output(SECONDARY_LCD_GPIO, 0);
}
static void __init omap_2430sdp_map_io(void)