lkml.org 
[lkml]   [2009]   [Nov]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v2 2/2] omap: RX-51: enable tsc2005
Hi,

ext Kalle Valo wrote:
> Aaro Koskinen <aaro.koskinen@nokia.com> writes:
>
>> Enable tsc2005 touchscreen driver on the RX-51 board.
>>
>> Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
>> ---
>>
>> The patch is for 2.6.32-rc6.
>
> [...]
>
>> +static struct spi_board_info rx51_peripherals_spi_board_info[] = {
>> + [0] = {
>> + .modalias = "tsc2005",
>> + .bus_num = 1,
>> + .chip_select = 0,
>> + .irq = OMAP_GPIO_IRQ(RX51_TSC2005_IRQ_GPIO),
>> + .max_speed_hz = 6000000,
>> + .controller_data = &tsc2005_mcspi_config,
>> + .platform_data = &tsc2005_config,
>> + },
>> +};
>
> I sent a wl1251 patch which adds spi_board_info and conflicts with
> this patch:
>
> http://www.mail-archive.com/linux-omap@vger.kernel.org/msg17604.html
>
> How do we handle this?

I can resend/rebase this patch once the wl1251 patch is integrated.

BTW, check the comment from Tommi Rantala - spi_board_info can be marked
with __initdata.

A.


\
 
 \ /
  Last update: 2009-11-09 14:33    [W:0.069 / U:0.132 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site