From 80984b9180e8da10c9f8263b6d3e400689884898 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 27 Jul 2010 10:47:23 +0800 Subject: [PATCH] =?utf8?q?=E5=A2=9E=E5=8A=A0=E9=94=90=E5=90=88=E6=9D=BF?= =?utf8?q?=E5=AD=90=E8=A7=A6=E6=91=B8=E5=B1=8F=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- arch/arm/mach-rk2818/board-raho.c | 4 ++-- drivers/input/touchscreen/xpt2046_ts.c | 4 ++++ drivers/spi/rk2818_spim.c | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-rk2818/board-raho.c b/arch/arm/mach-rk2818/board-raho.c index 94f24fb56a13..c8f43c9e5f7f 100644 --- 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 e92c31036ced..fcc74a55fc6c 100644 --- 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 638ec7dc99b5..ae5d0f5fe3e9 100644 --- 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); -- 2.34.1