2010-06-30 15:53:56

by Christoph Egger

Subject: [PATCH 01/33] Removing dead MTD_NAND_AT91_BUSWIDTH_16

MTD_NAND_AT91_BUSWIDTH_16 doesn't exist in Kconfig, therefore removing
all references for it from the source code.

Signed-off-by: Christoph Egger <[email protected]>
---
arch/arm/mach-at91/board-at572d940hf_ek.c | 4 ----
arch/arm/mach-at91/board-sam9m10g45ek.c | 4 ----
2 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/arch/arm/mach-at91/board-at572d940hf_ek.c b/arch/arm/mach-at91/board-at572d940hf_ek.c
index 5daff27..889a442 100644
--- a/arch/arm/mach-at91/board-at572d940hf_ek.c
+++ b/arch/arm/mach-at91/board-at572d940hf_ek.c
@@ -216,11 +216,7 @@ static struct atmel_nand_data __initdata eb_nand_data = {
/* .rdy_pin = AT91_PIN_PC16, */
.enable_pin = AT91_PIN_PA15,
.partition_info = nand_partitions,
-#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
- .bus_width_16 = 1,
-#else
.bus_width_16 = 0,
-#endif
};

static struct sam9_smc_config __initdata eb_nand_smc_config = {
diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
index ee80059..49ef850 100644
--- a/arch/arm/mach-at91/board-sam9m10g45ek.c
+++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
@@ -135,11 +135,7 @@ static struct atmel_nand_data __initdata ek_nand_data = {
.rdy_pin = AT91_PIN_PC8,
.enable_pin = AT91_PIN_PC14,
.partition_info = nand_partitions,
-#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
- .bus_width_16 = 1,
-#else
.bus_width_16 = 0,
-#endif
};

static struct sam9_smc_config __initdata ek_nand_smc_config = {
--
1.7.0.4

2010-06-30 17:53:26

by Kirill A. Shutemov

Subject: Re: [PATCH 01/33] Removing dead MTD_NAND_AT91_BUSWIDTH_16

On Wed, Jun 30, 2010 at 05:53:52PM +0200, Christoph Egger wrote:
> MTD_NAND_AT91_BUSWIDTH_16 doesn't exist in Kconfig, therefore removing
> all references for it from the source code.

It was renamed to MTD_NAND_ATMEL_BUSWIDTH_16 (see f6ed6f7).

I think better to rename it here too.

> Signed-off-by: Christoph Egger <[email protected]>
> ---
> arch/arm/mach-at91/board-at572d940hf_ek.c | 4 ----
> arch/arm/mach-at91/board-sam9m10g45ek.c | 4 ----
> 2 files changed, 0 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/mach-at91/board-at572d940hf_ek.c b/arch/arm/mach-at91/board-at572d940hf_ek.c
> index 5daff27..889a442 100644
> --- a/arch/arm/mach-at91/board-at572d940hf_ek.c
> +++ b/arch/arm/mach-at91/board-at572d940hf_ek.c
> @@ -216,11 +216,7 @@ static struct atmel_nand_data __initdata eb_nand_data = {
> /* .rdy_pin = AT91_PIN_PC16, */
> .enable_pin = AT91_PIN_PA15,
> .partition_info = nand_partitions,
> -#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
> - .bus_width_16 = 1,
> -#else
> .bus_width_16 = 0,
> -#endif
> };
>
> static struct sam9_smc_config __initdata eb_nand_smc_config = {
> diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
> index ee80059..49ef850 100644
> --- a/arch/arm/mach-at91/board-sam9m10g45ek.c
> +++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
> @@ -135,11 +135,7 @@ static struct atmel_nand_data __initdata ek_nand_data = {
> .rdy_pin = AT91_PIN_PC8,
> .enable_pin = AT91_PIN_PC14,
> .partition_info = nand_partitions,
> -#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
> - .bus_width_16 = 1,
> -#else
> .bus_width_16 = 0,
> -#endif
> };
>
> static struct sam9_smc_config __initdata ek_nand_smc_config = {
> --
> 1.7.0.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

--
Kirill A. Shutemov

2010-07-01 07:49:33

by Nicolas Ferre

Subject: [PATCH] AT91: Correct configuration define value

The MTD nand driver for Atmel chips is atmel_nand and not at91_nand anymore.
Change wrong configuration variables that were remaining.

Reported-by: Christoph Egger <[email protected]>
Signed-off-by: Nicolas Ferre <[email protected]>
---
Christoph,

Thank you for highlighting this. But please consider this
patch instead of yours.

arch/arm/mach-at91/board-at572d940hf_ek.c | 2 +-
arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-at91/board-at572d940hf_ek.c b/arch/arm/mach-at91/board-at572d940hf_ek.c
index 5daff27..4665162 100644
--- a/arch/arm/mach-at91/board-at572d940hf_ek.c
+++ b/arch/arm/mach-at91/board-at572d940hf_ek.c
@@ -216,7 +216,7 @@ static struct atmel_nand_data __initdata eb_nand_data = {
/* .rdy_pin = AT91_PIN_PC16, */
.enable_pin = AT91_PIN_PA15,
.partition_info = nand_partitions,
-#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
+#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
.bus_width_16 = 1,
#else
.bus_width_16 = 0,
diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
index ee80059..37af9b1 100644
--- a/arch/arm/mach-at91/board-sam9m10g45ek.c
+++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
@@ -135,7 +135,7 @@ static struct atmel_nand_data __initdata ek_nand_data = {
.rdy_pin = AT91_PIN_PC8,
.enable_pin = AT91_PIN_PC14,
.partition_info = nand_partitions,
-#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
+#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
.bus_width_16 = 1,
#else
.bus_width_16 = 0,
--
1.5.6.5

2010-07-01 09:14:32

by Kirill A. Shutemov

Subject: Re: [PATCH] AT91: Correct configuration define value

On Thu, Jul 01, 2010 at 10:55:45AM +0200, Nicolas Ferre wrote:
> The MTD nand driver for Atmel chips is atmel_nand and not at91_nand anymore.
> Change wrong configuration variables that were remaining.

Acked-by: Kirill A. Shutemov <[email protected]>

> Reported-by: Christoph Egger <[email protected]>
> Signed-off-by: Nicolas Ferre <[email protected]>
> ---
> Christoph,
>
> Thank you for highlighting this. But please consider this
> patch instead of yours.
>
> arch/arm/mach-at91/board-at572d940hf_ek.c | 2 +-
> arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-at91/board-at572d940hf_ek.c b/arch/arm/mach-at91/board-at572d940hf_ek.c
> index 5daff27..4665162 100644
> --- a/arch/arm/mach-at91/board-at572d940hf_ek.c
> +++ b/arch/arm/mach-at91/board-at572d940hf_ek.c
> @@ -216,7 +216,7 @@ static struct atmel_nand_data __initdata eb_nand_data = {
> /* .rdy_pin = AT91_PIN_PC16, */
> .enable_pin = AT91_PIN_PA15,
> .partition_info = nand_partitions,
> -#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
> +#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
> .bus_width_16 = 1,
> #else
> .bus_width_16 = 0,
> diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
> index ee80059..37af9b1 100644
> --- a/arch/arm/mach-at91/board-sam9m10g45ek.c
> +++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
> @@ -135,7 +135,7 @@ static struct atmel_nand_data __initdata ek_nand_data = {
> .rdy_pin = AT91_PIN_PC8,
> .enable_pin = AT91_PIN_PC14,
> .partition_info = nand_partitions,
> -#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
> +#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
> .bus_width_16 = 1,
> #else
> .bus_width_16 = 0,
> --
> 1.5.6.5
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

--
Kirill A. Shutemov

2010-08-20 17:03:12

by Nicolas Ferre

Subject: Re: [PATCH] AT91: Correct configuration define value

Le 01/07/2010 10:55, Nicolas Ferre :
> The MTD nand driver for Atmel chips is atmel_nand and not at91_nand anymore.
> Change wrong configuration variables that were remaining.
>
> Reported-by: Christoph Egger <[email protected]>
> Signed-off-by: Nicolas Ferre <[email protected]>

We can add:
Acked-by: Kirill A. Shutemov <[email protected]>

> ---
> Christoph,

Christoph,

Is this patch handled by you as part of your patch series or should I
include it in "Trivial" or "AT91" patch series?

Bye,

> Thank you for highlighting this. But please consider this
> patch instead of yours.
>
> arch/arm/mach-at91/board-at572d940hf_ek.c | 2 +-
> arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-at91/board-at572d940hf_ek.c b/arch/arm/mach-at91/board-at572d940hf_ek.c
> index 5daff27..4665162 100644
> --- a/arch/arm/mach-at91/board-at572d940hf_ek.c
> +++ b/arch/arm/mach-at91/board-at572d940hf_ek.c
> @@ -216,7 +216,7 @@ static struct atmel_nand_data __initdata eb_nand_data = {
> /* .rdy_pin = AT91_PIN_PC16, */
> .enable_pin = AT91_PIN_PA15,
> .partition_info = nand_partitions,
> -#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
> +#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
> .bus_width_16 = 1,
> #else
> .bus_width_16 = 0,
> diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
> index ee80059..37af9b1 100644
> --- a/arch/arm/mach-at91/board-sam9m10g45ek.c
> +++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
> @@ -135,7 +135,7 @@ static struct atmel_nand_data __initdata ek_nand_data = {
> .rdy_pin = AT91_PIN_PC8,
> .enable_pin = AT91_PIN_PC14,
> .partition_info = nand_partitions,
> -#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
> +#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
> .bus_width_16 = 1,
> #else
> .bus_width_16 = 0,


--
Nicolas Ferre

2010-08-23 03:03:44

by Jean-Christophe PLAGNIOL-VILLARD

Subject: Re: [PATCH] AT91: Correct configuration define value

On 17:18 Fri 20 Aug , Nicolas Ferre wrote:
> Le 01/07/2010 10:55, Nicolas Ferre :
> > The MTD nand driver for Atmel chips is atmel_nand and not at91_nand anymore.
> > Change wrong configuration variables that were remaining.
> >
> > Reported-by: Christoph Egger <[email protected]>
> > Signed-off-by: Nicolas Ferre <[email protected]>
>
> We can add:
> Acked-by: Kirill A. Shutemov <[email protected]>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Best Regards,
J.