From: Tommi Rantala on
Aaro Koskinen wrote:
> +static struct spi_board_info rx51_peripherals_spi_board_info[] = {

This can be marked with __initdata.

BR,
Tommi Rantala
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Kalle Valo on
Aaro Koskinen <aaro.koskinen(a)nokia.com> writes:

> Enable tsc2005 touchscreen driver on the RX-51 board.
>
> Signed-off-by: Aaro Koskinen <aaro.koskinen(a)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(a)vger.kernel.org/msg17604.html

How do we handle this?

--
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Aaro Koskinen on
Hi,

ext Kalle Valo wrote:
> Aaro Koskinen <aaro.koskinen(a)nokia.com> writes:
>
>> Enable tsc2005 touchscreen driver on the RX-51 board.
>>
>> Signed-off-by: Aaro Koskinen <aaro.koskinen(a)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(a)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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Kalle Valo on
Aaro Koskinen <aaro.koskinen(a)nokia.com> writes:

>> I sent a wl1251 patch which adds spi_board_info and conflicts with
>> this patch:
>>
>> http://www.mail-archive.com/linux-omap(a)vger.kernel.org/msg17604.html
>>
>> How do we handle this?
>
> I can resend/rebase this patch once the wl1251 patch is integrated.

Ok, thanks. I'll resend the wl1251 patch just to be sure that it
doesn't get lost.

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

I'll add it to my patch.

--
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/