增加锐合板子触摸屏的支持

diff --git a/arch/arm/mach-rk2818/board-raho.c b/arch/arm/mach-rk2818/board-raho.c
index 94f24fb56a133a538d07d7645b589cf1f3446626..c8f43c9e5f7fce3106eb14b44bb8b97475ed8a32 100644 (file)
--- a/arch/arm/mach-rk2818/board-raho.c
+++ b/arch/arm/mach-rk2818/board-raho.c
@@ -431,7 +431,8 @@ static struct spi_board_info board_spi_devices[] = {
                .mode   = SPI_MODE_0,
        },
 #endif 
-#if defined(CONFIG_TOUCHSCREEN_XPT2046_320X480_SPI) || defined(CONFIG_TOUCHSCREEN_XPT2046_320X480_CBN_SPI)
+#if defined(CONFIG_TOUCHSCREEN_XPT2046_320X480_SPI) || defined(CONFIG_TOUCHSCREEN_XPT2046_320X480_CBN_SPI)\
+    ||defined(CONFIG_TOUCHSCREEN_XPT2046_SPI) || defined(CONFIG_TOUCHSCREEN_XPT2046_CBN_SPI)
        {
                .modalias       = "xpt2046_ts",
                .chip_select    = 2,
@@ -441,7 +442,6 @@ static struct spi_board_info board_spi_devices[] = {
                .irq = RK2818_PIN_PE1,
        },
 #endif
-
 }; 
 
 /*rk2818_fb gpio information*/

diff --git a/drivers/input/touchscreen/xpt2046_ts.c b/drivers/input/touchscreen/xpt2046_ts.c
index e92c31036ced90fce49a3f48138aee9cbea64526..fcc74a55fc6c0f898d39234b045ed243ca687189 100644 (file)
--- a/drivers/input/touchscreen/xpt2046_ts.c
+++ b/drivers/input/touchscreen/xpt2046_ts.c
@@ -212,7 +212,11 @@ static struct xpt2046_platform_data xpt2046_info = {
        .debounce_max           = 7,
        .debounce_rep           = DEBOUNCE_REPTIME,
        .debounce_tol           = 20,
+#if defined(CONFIG_MACH_RAHO)  
+    .gpio_pendown              = RK2818_PIN_PE1,
+#else
        .gpio_pendown           = RK2818_PIN_PE3,
+#endif 
        .penirq_recheck_delay_usecs = 1,
 
 };

diff --git a/drivers/spi/rk2818_spim.c b/drivers/spi/rk2818_spim.c
index 638ec7dc99b5a1c6d3bfd36b148c54463350d56c..ae5d0f5fe3e9ae7859d6169f166146dbcedb5481 100644 (file)
--- a/drivers/spi/rk2818_spim.c
+++ b/drivers/spi/rk2818_spim.c
@@ -437,7 +437,8 @@ static void spi_chip_sel(struct rk2818_spi *dws, u16 cs)
        if (dws->cs_control){
            dws->cs_control(cs+1);
        }
-       rk2818_writel(dws, SPIM_SER, 1 << cs);
+       //rk2818_writel(dws, SPIM_SER, 1 << cs);
+       rk2818_writel(dws, SPIM_SER, 1 << 0);
 }
 
 static void pump_transfers(unsigned long data)
@@ -656,7 +657,7 @@ static void pump_messages(struct work_struct *work)
                                                struct spi_transfer,
                                                transfer_list);
        dws->cur_chip = spi_get_ctldata(dws->cur_msg->spi);
-    //dws->prev_chip = NULL; //ÿ¸öpump messageʱǿÖƸüÐÂcs dxj
+    dws->prev_chip = NULL; //ÿ¸öpump messageʱǿÖƸüÐÂcs dxj
     
        /* Mark as busy and launch transfers */
        tasklet_schedule(&dws->pump_transfers);