mx53: spidev enabled

diff --git a/_build/.config b/_build/.config
index 118f974a95ae6f0886c1476f7deef8ad44e5ab97..3c4f251b7079c6ba4557e79c8d4cd10e916ebffd 100644 (file)
--- a/_build/.config
+++ b/_build/.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.35.3
-# Tue Jan  8 15:16:36 2013
+# Tue Jan  8 15:18:28 2013
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
@@ -1260,7 +1260,7 @@ CONFIG_SPI_IMX=y
 #
 # SPI Protocol Masters
 #
-# CONFIG_SPI_SPIDEV is not set
+CONFIG_SPI_SPIDEV=y
 # CONFIG_SPI_TLE62X0 is not set
 
 #

diff --git a/arch/arm/mach-mx5/mx53_vmx.c b/arch/arm/mach-mx5/mx53_vmx.c
index 0f18250b75eb2c705878d32a05675eca3d2d4ee0..461c7e3c77fad11dfb745ae8d7b0f97c27b8c8a6 100644 (file)
--- a/arch/arm/mach-mx5/mx53_vmx.c
+++ b/arch/arm/mach-mx5/mx53_vmx.c
@@ -1002,17 +1002,6 @@ static struct spi_board_info mxc_ecspi1_board_info[] __initdata = {
         .mode = SPI_MODE_0,
        },
 #endif // CONFIG_MTD_M25P80
-#if defined(CONFIG_TOUCHSCREEN_ADS7846) || defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)
-       {
-        .modalias = "ads7846",                                                 // MASU FIXME regulator
-        .bus_num = 0,
-        .max_speed_hz = (125000 * 26), /* AD speed x (cmd + sample + before, after)*/
-        .irq = gpio_to_irq(VMX53_TSC2046_IRQ),
-        .chip_select = 2,
-        .platform_data = &ads7846_config,
-        .mode = SPI_MODE_2,
-       },
-#endif // CONFIG_TOUCHSCREEN_ADS7846
 #if defined(CONFIG_CAN_MCP251X) || defined(CONFIG_CAN_MCP251X_MODULE)
        {
         .modalias = "mcp251x",
@@ -1024,8 +1013,15 @@ static struct spi_board_info mxc_ecspi1_board_info[] __initdata = {
         .mode = SPI_MODE_0,
        },
 #endif // CONFIG_CAN_MCP251X
+       {
+        .modalias = "spidev",
+        .bus_num = 0,
+        .max_speed_hz = 10000000,
+        .chip_select = 2,
+        .mode = SPI_MODE_0,
+       },
 };
- 
+
 static int vmx53_spi_cs[] = {
        VMX53_ECSPI1_CS0,
        VMX53_ECSPI1_CS1,
@@ -1038,7 +1034,6 @@ static struct spi_imx_master vmx53_spi_pdata = {
        .num_chipselect = ARRAY_SIZE(vmx53_spi_cs),
 };
 
-
 static struct imxi2c_platform_data mxci2c_data = {
        .bitrate = 100000,
 };