[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4C8A07BA.9090805@ru.mvista.com>
Date: Fri, 10 Sep 2010 14:26:02 +0400
From: Sergei Shtylyov <sshtylyov@...sta.com>
To: Nicolas Ferre <nicolas.ferre@...el.com>
CC: linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
avictor.za@...il.com
Subject: Re: [PATCH] AT91: at91sam9261ek board: remove warnings related to
use of SPI or SD/MMC
Hello.
On 10-09-2010 14:13, Nicolas Ferre wrote:
> The sd/mmc data structure is not used if SPI is selected. The configuration
> of PIO on the board prevent from using both interfaces at the same time
> (board dependent).
> Remove the warnings at compilation time adding a preprocessor condition.
> Signed-off-by: Nicolas Ferre<nicolas.ferre@...el.com>
[...]
> diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c
> index b4307ab..19d4d2c 100644
> --- a/arch/arm/mach-at91/board-sam9261ek.c
> +++ b/arch/arm/mach-at91/board-sam9261ek.c
> @@ -169,17 +169,6 @@ static struct at91_udc_data __initdata ek_udc_data = {
>
>
> /*
> - * MCI (SD/MMC)
> - */
> -static struct at91_mmc_data __initdata ek_mmc_data = {
> - .wire4 = 1,
> -// .det_pin = ... not connected
> -// .wp_pin = ... not connected
> -// .vcc_pin = ... not connected
> -};
> -
> -
> -/*
> * NAND flash
> */
> static struct mtd_partition __initdata ek_nand_partition[] = {
> @@ -247,6 +236,10 @@ static void __init ek_add_device_nand(void)
> at91_add_device_nand(&ek_nand_data);
> }
>
> +/*
> + * SPI related devices
> + */
> +#if defined(CONFIG_SPI_ATMEL) || defined(CONFIG_SPI_ATMEL_MODULE)
>
> /*
> * ADS7846 Touchscreen
> @@ -357,6 +350,21 @@ static struct spi_board_info ek_spi_devices[] = {
> #endif
> };
>
> +#else /* CONFIG_SPI_ATMEL_* */
> +
> +/*
> + * MCI (SD/MMC)
> + * spi0 and mmc/sd share the same PIO pins: cannot be used at the same time
> + */
> +static struct at91_mmc_data __initdata ek_mmc_data = {
> + .wire4 = 1,
> +// .det_pin = ... not connected
> +// .wp_pin = ... not connected
> +// .vcc_pin = ... not connected
The coding style document forbids C99 style // comments. Could replace
with normal comment or #if 0...
WBR, Sergei
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists