Patchwork [U-Boot,v11,01/30] mtd: nand: Introduce CONFIG_SYS_NAND_BUSWIDTH_16BIT

login
register
mail settings
Submitter Benoît Thébaudeau
Date April 9, 2013, 7:48 p.m.
Message ID <1365536939-5755-1-git-send-email-benoit.thebaudeau@advansee.com>
Download mbox | patch
Permalink /patch/235195/
State Superseded
Delegated to: Albert ARIBAUD
Headers show

Comments

Benoît Thébaudeau - April 9, 2013, 7:48 p.m.
From: Fabio Estevam <fabio.estevam@freescale.com>

Introduce CONFIG_SYS_NAND_BUSWIDTH_16BIT option so that other NAND controller
drivers could use it when a 16-bit NAND is deployed.

drivers/mtd/nand/ndfc has CONFIG_SYS_NDFC_16BIT, so just rename it, so that
other NAND drivers could reuse the same symbol.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Scott Wood <scottwood@freescale.com>
Reviewed-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
---
Changes in v11: None
Changes in v10: None
Changes in v9: None
Changes in v8:
 - New patch.

Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None

 README                  |    9 ++++++---
 drivers/mtd/nand/ndfc.c |    4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)
Benoît Thébaudeau - April 9, 2013, 8 p.m.
On Tuesday, April 9, 2013 9:48:30 PM, Benoît Thébaudeau wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> Introduce CONFIG_SYS_NAND_BUSWIDTH_16BIT option so that other NAND controller
> drivers could use it when a 16-bit NAND is deployed.
> 
> drivers/mtd/nand/ndfc has CONFIG_SYS_NDFC_16BIT, so just rename it, so that
> other NAND drivers could reuse the same symbol.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> Acked-by: Scott Wood <scottwood@freescale.com>
> Reviewed-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
> ---
> Changes in v11: None
> Changes in v10: None
> Changes in v9: None
> Changes in v8:
>  - New patch.
> 
> Changes in v7: None
> Changes in v6: None
> Changes in v5: None
> Changes in v4: None
> Changes in v3: None
> Changes in v2: None
> 
>  README                  |    9 ++++++---
>  drivers/mtd/nand/ndfc.c |    4 ++--
>  2 files changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/README b/README
> index 5c5cd18..e9c3145 100644
> --- a/README
> +++ b/README
> @@ -3755,9 +3755,12 @@ Low Level (hardware related) configuration options:
>  - CONFIG_SYS_SRIOn_MEM_SIZE:
>  		Size of SRIO port 'n' memory region
>  
> -- CONFIG_SYS_NDFC_16
> -		Defined to tell the NDFC that the NAND chip is using a
> -		16 bit bus.
> +- CONFIG_SYS_NAND_BUSWIDTH_16BIT
> +		Defined to tell the NAND controller that the NAND chip is using
> +		a 16 bit bus.
> +		Not all NAND drivers use this symbol.
> +		Example of driver that uses it:
> +		- drivers/mtd/nand/ndfc.c
>  
>  - CONFIG_SYS_NDFC_EBC0_CFG
>  		Sets the EBC0_CFG register for the NDFC. If not defined
> diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
> index 6ebbb5e..213d2c9 100644
> --- a/drivers/mtd/nand/ndfc.c
> +++ b/drivers/mtd/nand/ndfc.c
> @@ -156,7 +156,7 @@ static uint8_t ndfc_read_byte(struct mtd_info *mtd)
>  
>  	struct nand_chip *chip = mtd->priv;
>  
> -#ifdef CONFIG_SYS_NDFC_16BIT
> +#ifdef CONFIG_SYS_NAND_BUSWIDTH_16BIT
>  	return (uint8_t) readw(chip->IO_ADDR_R);
>  #else
>  	return readb(chip->IO_ADDR_R);
> @@ -218,7 +218,7 @@ int board_nand_init(struct nand_chip *nand)
>  	nand->ecc.bytes = 3;
>  	nand->select_chip = ndfc_select_chip;
>  
> -#ifdef CONFIG_SYS_NDFC_16BIT
> +#ifdef CONFIG_SYS_NAND_BUSWIDTH_16BIT
>  	nand->options |= NAND_BUSWIDTH_16;
>  #endif
>  
> --
> 1.7.10.4
> 
> 

Git bundle for v11 here:
http://dl.free.fr/lWM6s9zmk

The changes in v11 are limited to 18/30 (mx31pdk.h).

Best regards,
Benoît
Albert ARIBAUD - April 10, 2013, 8:24 a.m.
Hi Benoît,

On Tue,  9 Apr 2013 21:48:30 +0200, Benoît Thébaudeau
<benoit.thebaudeau@advansee.com> wrote:

> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> Introduce CONFIG_SYS_NAND_BUSWIDTH_16BIT option so that other NAND controller
> drivers could use it when a 16-bit NAND is deployed.
> 
> drivers/mtd/nand/ndfc has CONFIG_SYS_NDFC_16BIT, so just rename it, so that
> other NAND drivers could reuse the same symbol.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> Acked-by: Scott Wood <scottwood@freescale.com>
> Reviewed-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
> ---

Diff'ed with v10 *and* build-checked across ARM, all clear.

Unless there is screaming opposition, I intend to merge v11 (along with
Fabio's mx31pdk watchdog patch) by end of afternoon TLS (GMT+2) time.

Amicalement,
Albert ARIBAUD - April 10, 2013, 8:43 p.m.
Hi Benoît,

On Tue,  9 Apr 2013 21:48:30 +0200, Benoît Thébaudeau
<benoit.thebaudeau@advansee.com> wrote:

> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> Introduce CONFIG_SYS_NAND_BUSWIDTH_16BIT option so that other NAND controller
> drivers could use it when a 16-bit NAND is deployed.
> 
> drivers/mtd/nand/ndfc has CONFIG_SYS_NDFC_16BIT, so just rename it, so that
> other NAND drivers could reuse the same symbol.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> Acked-by: Scott Wood <scottwood@freescale.com>
> Reviewed-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
> ---

Whole series applied to u-boot-arm/master, thanks!

Amicalement,
Benoît Thébaudeau - April 10, 2013, 9:26 p.m.
Hi Albert,

On Wednesday, April 10, 2013 10:43:31 PM, Albert ARIBAUD wrote:
> Hi Benoît,
> 
> On Tue,  9 Apr 2013 21:48:30 +0200, Benoît Thébaudeau
> <benoit.thebaudeau@advansee.com> wrote:
> 
> > From: Fabio Estevam <fabio.estevam@freescale.com>
> > 
> > Introduce CONFIG_SYS_NAND_BUSWIDTH_16BIT option so that other NAND
> > controller
> > drivers could use it when a 16-bit NAND is deployed.
> > 
> > drivers/mtd/nand/ndfc has CONFIG_SYS_NDFC_16BIT, so just rename it, so that
> > other NAND drivers could reuse the same symbol.
> > 
> > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> > Acked-by: Scott Wood <scottwood@freescale.com>
> > Reviewed-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
> > ---
> 
> Whole series applied to u-boot-arm/master, thanks!

Thanks, but you have applied the bundle from my branch instead of the series
from the mailing list, so all commit messages are crippled with patman stuff,
my SoB is missing, and 01 and 02/30 do not have Fabio set as the author. Is it
possible to fix this?

Best regards,
Benoît
Fabio Estevam - April 10, 2013, 9:34 p.m.
On Wed, Apr 10, 2013 at 6:26 PM, Benoît Thébaudeau
<benoit.thebaudeau@advansee.com> wrote:

> Thanks, but you have applied the bundle from my branch instead of the series
> from the mailing list, so all commit messages are crippled with patman stuff,
> my SoB is missing, and 01 and 02/30 do not have Fabio set as the author. Is it
> possible to fix this?

Yes, in u-boot-arm the authorship is not correct:

commit 2dc82d58a37a5e05bb7b54ec658e89275f71b1ba
Author: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Date:   Thu Feb 28 21:38:00 2013 +0100

    mtd: nand: Introduce CONFIG_SYS_NAND_BUSWIDTH_16BIT

    From: Fabio Estevam <fabio.estevam@freescale.com>

    Introduce CONFIG_SYS_NAND_BUSWIDTH_16BIT option so that other NAND
controller
    drivers could use it when a 16-bit NAND is deployed.

    drivers/mtd/nand/ndfc has CONFIG_SYS_NDFC_16BIT, so just rename it, so that
    other NAND drivers could reuse the same symbol.

    Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
    Reviewed-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
    Acked-by: Scott Wood <scottwood@freescale.com>
    Cc: Fabio Estevam <fabio.estevam@freescale.com>
    Cc: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
    Series-to: nand, imx, arm
    Series-cc: marex
    Series-version: 11
    Series-name: mxc-nand
    Series-changes: 8
     - New patch.

Regards,

Fabio Estevam
Albert ARIBAUD - April 10, 2013, 9:55 p.m.
Hi Benoît,

On Wed, 10 Apr 2013 23:26:10 +0200 (CEST), Benoît Thébaudeau
<benoit.thebaudeau@advansee.com> wrote:

> Hi Albert,
> 
> On Wednesday, April 10, 2013 10:43:31 PM, Albert ARIBAUD wrote:
> > Hi Benoît,
> > 
> > On Tue,  9 Apr 2013 21:48:30 +0200, Benoît Thébaudeau
> > <benoit.thebaudeau@advansee.com> wrote:
> > 
> > > From: Fabio Estevam <fabio.estevam@freescale.com>
> > > 
> > > Introduce CONFIG_SYS_NAND_BUSWIDTH_16BIT option so that other NAND
> > > controller
> > > drivers could use it when a 16-bit NAND is deployed.
> > > 
> > > drivers/mtd/nand/ndfc has CONFIG_SYS_NDFC_16BIT, so just rename it, so that
> > > other NAND drivers could reuse the same symbol.
> > > 
> > > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> > > Acked-by: Scott Wood <scottwood@freescale.com>
> > > Reviewed-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
> > > ---
> > 
> > Whole series applied to u-boot-arm/master, thanks!
> 
> Thanks, but you have applied the bundle from my branch instead of the series
> from the mailing list, so all commit messages are crippled with patman stuff,
> my SoB is missing, and 01 and 02/30 do not have Fabio set as the author. Is it
> possible to fix this?

Argh! Fixing this ASAP.

> Best regards,
> Benoît

Amicalement,
Albert ARIBAUD - April 10, 2013, 10:14 p.m.
Hi Fabio,

On Wed, 10 Apr 2013 18:34:13 -0300, Fabio Estevam <festevam@gmail.com>
wrote:

> On Wed, Apr 10, 2013 at 6:26 PM, Benoît Thébaudeau
> <benoit.thebaudeau@advansee.com> wrote:
> 
> > Thanks, but you have applied the bundle from my branch instead of the series
> > from the mailing list, so all commit messages are crippled with patman stuff,
> > my SoB is missing, and 01 and 02/30 do not have Fabio set as the author. Is it
> > possible to fix this?
> 
> Yes, in u-boot-arm the authorship is not correct:
> 
> commit 2dc82d58a37a5e05bb7b54ec658e89275f71b1ba
> Author: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
> Date:   Thu Feb 28 21:38:00 2013 +0100
> 
>     mtd: nand: Introduce CONFIG_SYS_NAND_BUSWIDTH_16BIT
> 
>     From: Fabio Estevam <fabio.estevam@freescale.com>
> 
>     Introduce CONFIG_SYS_NAND_BUSWIDTH_16BIT option so that other NAND
> controller
>     drivers could use it when a 16-bit NAND is deployed.
> 
>     drivers/mtd/nand/ndfc has CONFIG_SYS_NDFC_16BIT, so just rename it, so that
>     other NAND drivers could reuse the same symbol.
> 
>     Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
>     Reviewed-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
>     Acked-by: Scott Wood <scottwood@freescale.com>
>     Cc: Fabio Estevam <fabio.estevam@freescale.com>
>     Cc: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
>     Series-to: nand, imx, arm
>     Series-cc: marex
>     Series-version: 11
>     Series-name: mxc-nand
>     Series-changes: 8
>      - New patch.

Ok, series re-applied from patchwork, diffed with bundle (identical,
phew!) and authorship and commit messages are now fine.

/me thinks a git hook to detect lingering patman lines in commit
messages before doing a git push would be a Good Thing.

> Regards,
> 
> Fabio Estevam

Amicalement,

Patch

diff --git a/README b/README
index 5c5cd18..e9c3145 100644
--- a/README
+++ b/README
@@ -3755,9 +3755,12 @@  Low Level (hardware related) configuration options:
 - CONFIG_SYS_SRIOn_MEM_SIZE:
 		Size of SRIO port 'n' memory region
 
-- CONFIG_SYS_NDFC_16
-		Defined to tell the NDFC that the NAND chip is using a
-		16 bit bus.
+- CONFIG_SYS_NAND_BUSWIDTH_16BIT
+		Defined to tell the NAND controller that the NAND chip is using
+		a 16 bit bus.
+		Not all NAND drivers use this symbol.
+		Example of driver that uses it:
+		- drivers/mtd/nand/ndfc.c
 
 - CONFIG_SYS_NDFC_EBC0_CFG
 		Sets the EBC0_CFG register for the NDFC. If not defined
diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
index 6ebbb5e..213d2c9 100644
--- a/drivers/mtd/nand/ndfc.c
+++ b/drivers/mtd/nand/ndfc.c
@@ -156,7 +156,7 @@  static uint8_t ndfc_read_byte(struct mtd_info *mtd)
 
 	struct nand_chip *chip = mtd->priv;
 
-#ifdef CONFIG_SYS_NDFC_16BIT
+#ifdef CONFIG_SYS_NAND_BUSWIDTH_16BIT
 	return (uint8_t) readw(chip->IO_ADDR_R);
 #else
 	return readb(chip->IO_ADDR_R);
@@ -218,7 +218,7 @@  int board_nand_init(struct nand_chip *nand)
 	nand->ecc.bytes = 3;
 	nand->select_chip = ndfc_select_chip;
 
-#ifdef CONFIG_SYS_NDFC_16BIT
+#ifdef CONFIG_SYS_NAND_BUSWIDTH_16BIT
 	nand->options |= NAND_BUSWIDTH_16;
 #endif