| Message ID | 20240307091014.39796-3-ada@thorsis.com |
|---|---|
| State | Superseded |
| Delegated to: | Dario Binacchi |
| Headers | show |
| Series | mtd: nand: raw: Collected improvements | expand |
Hi On Thu, Mar 7, 2024 at 10:10 AM Alexander Dahl <ada@thorsis.com> wrote: > > Introduced in upstream Linux with commit 7a08dbaedd365 for release v5.0. > > When the new atmel nand driver was backported to U-Boot with commit > 6a8dfd57220d ("nand: atmel: Add DM based NAND driver") that definition > was added to the driver instead of the header file. Move it over to the > other definitions with the same help text it has in Linux. > > Code actually using this has not been ported over to raw nand base yet. > > Signed-off-by: Alexander Dahl <ada@thorsis.com> > --- > drivers/mtd/nand/raw/atmel/nand-controller.c | 2 -- > include/linux/mtd/rawnand.h | 7 +++++++ > 2 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/mtd/nand/raw/atmel/nand-controller.c b/drivers/mtd/nand/raw/atmel/nand-controller.c > index 0e0441472b8..e06523f3298 100644 > --- a/drivers/mtd/nand/raw/atmel/nand-controller.c > +++ b/drivers/mtd/nand/raw/atmel/nand-controller.c > @@ -1429,8 +1429,6 @@ static int atmel_nand_setup_data_interface(struct mtd_info *mtd, int csline, > return nc->caps->ops->setup_data_interface(nand, csline, conf); > } > > -#define NAND_KEEP_TIMINGS 0x00800000 > - > static void atmel_nand_init(struct atmel_nand_controller *nc, > struct atmel_nand *nand) > { > diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h > index fb002ae6411..4abaf4734cf 100644 > --- a/include/linux/mtd/rawnand.h > +++ b/include/linux/mtd/rawnand.h > @@ -249,6 +249,13 @@ enum nand_ecc_algo { > */ > #define NAND_USE_BOUNCE_BUFFER 0x00100000 > > +/* > + * Do not try to tweak the timings at runtime. This is needed when the > + * controller initializes the timings on itself or when it relies on > + * configuration done by the bootloader. > + */ > +#define NAND_KEEP_TIMINGS 0x00800000 > + > /* Options set by nand scan */ > /* bbt has already been read */ > #define NAND_BBT_SCANNED 0x40000000 Reviewed-by: Michael Trimarchi <michael@amarulasolutions.com> > -- > 2.39.2 >
diff --git a/drivers/mtd/nand/raw/atmel/nand-controller.c b/drivers/mtd/nand/raw/atmel/nand-controller.c index 0e0441472b8..e06523f3298 100644 --- a/drivers/mtd/nand/raw/atmel/nand-controller.c +++ b/drivers/mtd/nand/raw/atmel/nand-controller.c @@ -1429,8 +1429,6 @@ static int atmel_nand_setup_data_interface(struct mtd_info *mtd, int csline, return nc->caps->ops->setup_data_interface(nand, csline, conf); } -#define NAND_KEEP_TIMINGS 0x00800000 - static void atmel_nand_init(struct atmel_nand_controller *nc, struct atmel_nand *nand) { diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index fb002ae6411..4abaf4734cf 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -249,6 +249,13 @@ enum nand_ecc_algo { */ #define NAND_USE_BOUNCE_BUFFER 0x00100000 +/* + * Do not try to tweak the timings at runtime. This is needed when the + * controller initializes the timings on itself or when it relies on + * configuration done by the bootloader. + */ +#define NAND_KEEP_TIMINGS 0x00800000 + /* Options set by nand scan */ /* bbt has already been read */ #define NAND_BBT_SCANNED 0x40000000
Introduced in upstream Linux with commit 7a08dbaedd365 for release v5.0. When the new atmel nand driver was backported to U-Boot with commit 6a8dfd57220d ("nand: atmel: Add DM based NAND driver") that definition was added to the driver instead of the header file. Move it over to the other definitions with the same help text it has in Linux. Code actually using this has not been ported over to raw nand base yet. Signed-off-by: Alexander Dahl <ada@thorsis.com> --- drivers/mtd/nand/raw/atmel/nand-controller.c | 2 -- include/linux/mtd/rawnand.h | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-)