| Message ID | 20190514215315.19228-3-lede@allycomm.com |
|---|---|
| State | Superseded |
| Delegated to: | Miquel Raynal |
| Headers | show |
| Series | [v2,1/3] mtd: spinand: Add #define-s for page-read ops withthree-byte addresses | expand |
On 14.05.19 23:53, Jeff Kletsky wrote: > From: Jeff Kletsky <git-commits@allycomm.com> > > The GigaDevice GD5F1GQ4UFxxG SPI NAND utilizes two-byte device IDs. > > http://www.gigadevice.com/datasheet/gd5f1gq4xfxxg/ > > Signed-off-by: Jeff Kletsky <git-commits@allycomm.com> Reviewed-by: Frieder Schrempf <frieder.schrempf@kontron.de> > --- > drivers/mtd/nand/spi/core.c | 2 +- > include/linux/mtd/spinand.h | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c > index fa87ae28cdfe..a13154785dad 100644 > --- a/drivers/mtd/nand/spi/core.c > +++ b/drivers/mtd/nand/spi/core.c > @@ -853,7 +853,7 @@ spinand_select_op_variant(struct spinand_device *spinand, > */ > int spinand_match_and_init(struct spinand_device *spinand, > const struct spinand_info *table, > - unsigned int table_size, u8 devid) > + unsigned int table_size, u16 devid) > { > struct nand_device *nand = spinand_to_nand(spinand); > unsigned int i; > diff --git a/include/linux/mtd/spinand.h b/include/linux/mtd/spinand.h > index 05fe98eebe27..8901ba272538 100644 > --- a/include/linux/mtd/spinand.h > +++ b/include/linux/mtd/spinand.h > @@ -290,7 +290,7 @@ struct spinand_ecc_info { > */ > struct spinand_info { > const char *model; > - u8 devid; > + u16 devid; > u32 flags; > struct nand_memory_organization memorg; > struct nand_ecc_req eccreq; > @@ -445,7 +445,7 @@ static inline void spinand_set_of_node(struct spinand_device *spinand, > > int spinand_match_and_init(struct spinand_device *dev, > const struct spinand_info *table, > - unsigned int table_size, u8 devid); > + unsigned int table_size, u16 devid); > > int spinand_upd_cfg(struct spinand_device *spinand, u8 mask, u8 val); > int spinand_select_target(struct spinand_device *spinand, unsigned int target); >
diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c index fa87ae28cdfe..a13154785dad 100644 --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c @@ -853,7 +853,7 @@ spinand_select_op_variant(struct spinand_device *spinand, */ int spinand_match_and_init(struct spinand_device *spinand, const struct spinand_info *table, - unsigned int table_size, u8 devid) + unsigned int table_size, u16 devid) { struct nand_device *nand = spinand_to_nand(spinand); unsigned int i; diff --git a/include/linux/mtd/spinand.h b/include/linux/mtd/spinand.h index 05fe98eebe27..8901ba272538 100644 --- a/include/linux/mtd/spinand.h +++ b/include/linux/mtd/spinand.h @@ -290,7 +290,7 @@ struct spinand_ecc_info { */ struct spinand_info { const char *model; - u8 devid; + u16 devid; u32 flags; struct nand_memory_organization memorg; struct nand_ecc_req eccreq; @@ -445,7 +445,7 @@ static inline void spinand_set_of_node(struct spinand_device *spinand, int spinand_match_and_init(struct spinand_device *dev, const struct spinand_info *table, - unsigned int table_size, u8 devid); + unsigned int table_size, u16 devid); int spinand_upd_cfg(struct spinand_device *spinand, u8 mask, u8 val); int spinand_select_target(struct spinand_device *spinand, unsigned int target);