Re: [PATCH] AT91: at91sam9261ek board: remove warnings related to use of SPI or SD/MMC

Re: [PATCH] AT91: at91sam9261ek board: remove warnings related to use of SPI or SD/MMC

[Jean-Christophe PLAGNIOL-VILLARD]

> +/*
> + * 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
can we remove this 3 comments

Best Regards,
J.

Re: [PATCH] AT91: dm9000 initialization update

[Jean-Christophe PLAGNIOL-VILLARD]

On 12:13 Fri 10 Sep     , Nicolas Ferre wrote:
> Add information in dm9000 mac/phy chip initialization:
> - irq resource details
> - platform data details
> 
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
>  arch/arm/mach-at91/board-sam9261ek.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c
> index c4c8865..b4307ab 100644
> --- a/arch/arm/mach-at91/board-sam9261ek.c
> +++ b/arch/arm/mach-at91/board-sam9261ek.c
> @@ -93,11 +93,12 @@ static struct resource dm9000_resource[] = {
>  		.start	= AT91_PIN_PC11,
>  		.end	= AT91_PIN_PC11,
>  		.flags	= IORESOURCE_IRQ
> +			| IORESOURCE_IRQ_LOWEDGE | IORESOURCE_IRQ_HIGHEDGE,
both?

Best Regards,
J.

Re: [PATCH] AT91: dm9000 initialization update

[Nicolas Ferre]

Le 10/09/2010 11:23, Jean-Christophe PLAGNIOL-VILLARD :
> On 12:13 Fri 10 Sep     , Nicolas Ferre wrote:
>> Add information in dm9000 mac/phy chip initialization:
>> - irq resource details
>> - platform data details
>>
>> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
>> ---
>>  arch/arm/mach-at91/board-sam9261ek.c |    3 ++-
>>  1 files changed, 2 insertions(+), 1 deletions(-)
>>
>> diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c
>> index c4c8865..b4307ab 100644
>> --- a/arch/arm/mach-at91/board-sam9261ek.c
>> +++ b/arch/arm/mach-at91/board-sam9261ek.c
>> @@ -93,11 +93,12 @@ static struct resource dm9000_resource[] = {
>>  		.start	= AT91_PIN_PC11,
>>  		.end	= AT91_PIN_PC11,
>>  		.flags	= IORESOURCE_IRQ
>> +			| IORESOURCE_IRQ_LOWEDGE | IORESOURCE_IRQ_HIGHEDGE,
> both?

Yes, only configuration supported by GPIO irqs...

Regards,
-- 
Nicolas Ferre

[PATCH] AT91: dm9000 initialization update

[Nicolas Ferre]

Add information in dm9000 mac/phy chip initialization:
- irq resource details
- platform data details

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
 arch/arm/mach-at91/board-sam9261ek.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c
index c4c8865..b4307ab 100644
--- a/arch/arm/mach-at91/board-sam9261ek.c
+++ b/arch/arm/mach-at91/board-sam9261ek.c
@@ -93,11 +93,12 @@ static struct resource dm9000_resource[] = {
 		.start	= AT91_PIN_PC11,
 		.end	= AT91_PIN_PC11,
 		.flags	= IORESOURCE_IRQ
+			| IORESOURCE_IRQ_LOWEDGE | IORESOURCE_IRQ_HIGHEDGE,
 	}
 };
 
 static struct dm9000_plat_data dm9000_platdata = {
-	.flags		= DM9000_PLATF_16BITONLY,
+	.flags		= DM9000_PLATF_16BITONLY | DM9000_PLATF_NO_EEPROM,
 };
 
 static struct platform_device dm9000_device = {
-- 
1.5.6.5

[PATCH] AT91: at91sam9261ek board: remove warnings related to use of SPI or SD/MMC

[Nicolas Ferre]

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@atmel.com>
---
 arch/arm/mach-at91/board-sam9261ek.c |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 deletions(-)

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
+};
+
+#endif /* CONFIG_SPI_ATMEL_* */
+
 
 /*
  * LCD Controller
-- 
1.5.6.5

Re: [PATCH] AT91: dm9000 initialization update

[Jean-Christophe PLAGNIOL-VILLARD]

On 11:51 Fri 10 Sep     , Nicolas Ferre wrote:
> Le 10/09/2010 11:23, Jean-Christophe PLAGNIOL-VILLARD :
> > On 12:13 Fri 10 Sep     , Nicolas Ferre wrote:
> >> Add information in dm9000 mac/phy chip initialization:
> >> - irq resource details
> >> - platform data details
> >>
> >> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> >> ---
> >>  arch/arm/mach-at91/board-sam9261ek.c |    3 ++-
> >>  1 files changed, 2 insertions(+), 1 deletions(-)
> >>
> >> diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c
> >> index c4c8865..b4307ab 100644
> >> --- a/arch/arm/mach-at91/board-sam9261ek.c
> >> +++ b/arch/arm/mach-at91/board-sam9261ek.c
> >> @@ -93,11 +93,12 @@ static struct resource dm9000_resource[] = {
> >>  		.start	= AT91_PIN_PC11,
> >>  		.end	= AT91_PIN_PC11,
> >>  		.flags	= IORESOURCE_IRQ
> >> +			| IORESOURCE_IRQ_LOWEDGE | IORESOURCE_IRQ_HIGHEDGE,
> > both?
> 
> Yes, only configuration supported by GPIO irqs...
ok fine

Best Regards,
J.

Re: [PATCH] AT91: dm9000 initialization update

[Jean-Christophe PLAGNIOL-VILLARD]

On 12:13 Fri 10 Sep     , Nicolas Ferre wrote:
> Add information in dm9000 mac/phy chip initialization:
> - irq resource details
> - platform data details
> 
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

Best Regards,
J.

Re: [PATCH] AT91: at91sam9261ek board: remove warnings related to use of SPI or SD/MMC

[Sergei Shtylyov]

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@atmel.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

Re: [PATCH] AT91: at91sam9261ek board: remove warnings related to use of SPI or SD/MMC

[Jean-Christophe PLAGNIOL-VILLARD]

> >   * 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...
no dead code please

Best Regards,
J.

Re: [PATCH] AT91: at91sam9261ek board: remove warnings related to use of SPI or SD/MMC

[Nicolas Ferre]

Le 10/09/2010 13:06, Jean-Christophe PLAGNIOL-VILLARD :
>>>   * 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...
> no dead code please

I kept those comments because it is just a move of code.

But ok, it seem that they are not liked by several people. As I am in a
"tiny fixes" mood, I post an additional patch to remove them ;-)

Cheers,
-- 
Nicolas Ferre

Re: [PATCH] AT91: at91sam9261ek: remove C99 comments but keep information

[Jean-Christophe PLAGNIOL-VILLARD]

On 14:42 Fri 10 Sep     , Nicolas Ferre wrote:
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

Best Regards,
J.

[PATCH] AT91: at91sam9261ek: remove C99 comments but keep information

[Nicolas Ferre]

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
 arch/arm/mach-at91/board-sam9261ek.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c
index 19d4d2c..65eb094 100644
--- a/arch/arm/mach-at91/board-sam9261ek.c
+++ b/arch/arm/mach-at91/board-sam9261ek.c
@@ -351,16 +351,14 @@ static struct spi_board_info ek_spi_devices[] = {
 };
 
 #else /* CONFIG_SPI_ATMEL_* */
+/* spi0 and mmc/sd share the same PIO pins: cannot be used at the same time */
 
 /*
  * MCI (SD/MMC)
- * spi0 and mmc/sd share the same PIO pins: cannot be used at the same time
+ * det_pin, wp_pin and vcc_pin are not connected
  */
 static struct at91_mmc_data __initdata ek_mmc_data = {
 	.wire4		= 1,
-//	.det_pin	= ... not connected
-//	.wp_pin		= ... not connected
-//	.vcc_pin	= ... not connected
 };
 
 #endif /* CONFIG_SPI_ATMEL_* */
-- 
1.5.6.5