linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Aaro Koskinen <aaro.koskinen@nokia.com>
To: ext Kalle Valo <kalle.valo@iki.fi>
Cc: "linux-input@vger.kernel.org" <linux-input@vger.kernel.org>,
	"linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"dmitry.torokhov@gmail.com" <dmitry.torokhov@gmail.com>,
	"tony@atomide.com" <tony@atomide.com>
Subject: Re: [PATCH v2 2/2] omap: RX-51: enable tsc2005
Date: Mon, 09 Nov 2009 15:29:30 +0200	[thread overview]
Message-ID: <4AF8193A.70505@nokia.com> (raw)
In-Reply-To: <87d43ufih0.fsf@purkki.valot.fi>

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.

  reply	other threads:[~2009-11-09 13:29 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-04 13:23 [PATCH v2 1/2] input: touchscreen: introduce tsc2005 driver Aaro Koskinen
2009-11-04 13:23 ` [PATCH v2 2/2] omap: RX-51: enable tsc2005 Aaro Koskinen
2009-11-04 15:07   ` Tommi Rantala
2009-11-07 15:43   ` Kalle Valo
2009-11-09 13:29     ` Aaro Koskinen [this message]
2009-11-10 10:30       ` Kalle Valo
2009-11-14  6:03 ` [PATCH v2 1/2] input: touchscreen: introduce tsc2005 driver Dmitry Torokhov
2009-11-16 12:37   ` Phil Carmody
2009-11-16 15:23     ` Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4AF8193A.70505@nokia.com \
    --to=aaro.koskinen@nokia.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=kalle.valo@iki.fi \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).