#include <linux/err.h>
 #include <linux/clk.h>
 #include <linux/io.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/ads7846.h>
 
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/arch/usb-musb.h>
 #include <asm/arch/usb-ehci.h>
 #include <asm/arch/common.h>
+#include <asm/arch/mcspi.h>
 
 static struct omap_uart_config omap3_evm_uart_config __initdata = {
        .enabled_uarts  = ((1 << 0) | (1 << 1) | (1 << 2)),
        .id             = -1,
 };
 
+static void ads7846_dev_init(void)
+{
+       if (omap_request_gpio(OMAP3_EVM_TS_GPIO) < 0)
+               printk(KERN_ERR "can't get ads7846 pen down GPIO\n");
+
+       omap_set_gpio_direction(OMAP3_EVM_TS_GPIO, 1);
+
+       omap_set_gpio_debounce(OMAP3_EVM_TS_GPIO, 1);
+       omap_set_gpio_debounce_time(OMAP3_EVM_TS_GPIO, 0xa);
+}
+
+static int ads7846_get_pendown_state(void)
+{
+       return !omap_get_gpio_datain(OMAP3_EVM_TS_GPIO);
+}
+
+struct ads7846_platform_data ads7846_config = {
+       .get_pendown_state      = ads7846_get_pendown_state,
+       .keep_vref_on           = 1,
+};
+
+static struct omap2_mcspi_device_config ads7846_mcspi_config = {
+       .turbo_mode     = 0,
+       .single_channel = 1,  /* 0: slave, 1: master */
+};
+
+struct spi_board_info omap3evm_spi_board_info[] = {
+       [0] = {
+               .modalias               = "ads7846",
+               .bus_num                = 1,
+               .chip_select            = 0,
+               .max_speed_hz           = 1500000,
+               .controller_data        = &ads7846_mcspi_config,
+               .irq                    = OMAP_GPIO_IRQ(OMAP3_EVM_TS_GPIO),
+               .platform_data          = &ads7846_config,
+       },
+};
+
 static void __init omap3_evm_init_irq(void)
 {
        omap2_init_common_hw();
        platform_add_devices(omap3_evm_devices, ARRAY_SIZE(omap3_evm_devices));
        omap_board_config = omap3_evm_config;
        omap_board_config_size = ARRAY_SIZE(omap3_evm_config);
+
+       spi_register_board_info(omap3evm_spi_board_info,
+                               ARRAY_SIZE(omap3evm_spi_board_info));
+
        omap_serial_init();
        hsmmc_init();
        usb_musb_init();
        usb_ehci_init();
        omap3evm_flash_init();
+       ads7846_dev_init();
 }
 
 arch_initcall(omap3_evm_i2c_init);