From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pali =?utf-8?B?Um9ow6Fy?= Date: Wed, 10 Feb 2021 10:33:54 +0100 Subject: [PATCH u-boot-dm + u-boot-spi v2 4/7] mtd: spi-nor: allow registering multiple MTDs when DM is enabled In-Reply-To: <20210209144452.31134-5-marek.behun@nic.cz> References: <20210209144452.31134-1-marek.behun@nic.cz> <20210209144452.31134-5-marek.behun@nic.cz> Message-ID: <20210210093354.byrnnp6hieor5ulg@pali> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Tuesday 09 February 2021 15:44:49 Marek Beh?n wrote: > Currently when the SPI_FLASH_MTD config option is enabled, only one SPI > can be registered as MTD at any time - it is the last one probed (since > with old non-DM model only one SPI NOR could be probed at any time). > > When DM is enabled, allow for registering multiple SPI NORs as MTDs by > utilizing the nor->mtd structure, which is filled in by spi_nor_scan > anyway, instead of filling a separate struct mtd_info. > > Signed-off-by: Marek Beh?n > Cc: Jagan Teki > Cc: Priyanka Jain > Cc: Simon Glass > Cc: Heiko Schocher > Cc: Jagan Teki Reviewed-by: Pali Roh?r > --- > drivers/mtd/spi/sf_internal.h | 4 ++-- > drivers/mtd/spi/sf_mtd.c | 18 +++++++++++++++++- > drivers/mtd/spi/sf_probe.c | 6 ++++-- > 3 files changed, 23 insertions(+), 5 deletions(-) > > diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h > index 9ceff0e7c1..865955124c 100644 > --- a/drivers/mtd/spi/sf_internal.h > +++ b/drivers/mtd/spi/sf_internal.h > @@ -77,14 +77,14 @@ extern const struct flash_info spi_nor_ids[]; > > #if CONFIG_IS_ENABLED(SPI_FLASH_MTD) > int spi_flash_mtd_register(struct spi_flash *flash); > -void spi_flash_mtd_unregister(void); > +void spi_flash_mtd_unregister(struct spi_flash *flash); > #else > static inline int spi_flash_mtd_register(struct spi_flash *flash) > { > return 0; > } > > -static inline void spi_flash_mtd_unregister(void) > +static inline void spi_flash_mtd_unregister(struct spi_flash *flash) > { > } > #endif > diff --git a/drivers/mtd/spi/sf_mtd.c b/drivers/mtd/spi/sf_mtd.c > index 987fac2501..94854fbfc4 100644 > --- a/drivers/mtd/spi/sf_mtd.c > +++ b/drivers/mtd/spi/sf_mtd.c > @@ -10,6 +10,20 @@ > #include > #include > > +#if CONFIG_IS_ENABLED(DM_SPI_FLASH) > + > +int spi_flash_mtd_register(struct spi_flash *flash) > +{ > + return add_mtd_device(&flash->mtd); > +} > + > +void spi_flash_mtd_unregister(struct spi_flash *flash) > +{ > + del_mtd_device(&flash->mtd); > +} > + > +#else /* !CONFIG_IS_ENABLED(DM_SPI_FLASH) */ > + > static struct mtd_info sf_mtd_info; > static bool sf_mtd_registered; > static char sf_mtd_name[8]; > @@ -123,7 +137,7 @@ int spi_flash_mtd_register(struct spi_flash *flash) > return ret; > } > > -void spi_flash_mtd_unregister(void) > +void spi_flash_mtd_unregister(struct spi_flash *flash) > { > int ret; > > @@ -146,3 +160,5 @@ void spi_flash_mtd_unregister(void) > printf("Failed to unregister MTD %s and the spi_flash object is going away: you're in deep trouble!", > sf_mtd_info.name); > } > + > +#endif /* !CONFIG_IS_ENABLED(DM_SPI_FLASH) */ > diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c > index 6c87434867..3bf2ecd51a 100644 > --- a/drivers/mtd/spi/sf_probe.c > +++ b/drivers/mtd/spi/sf_probe.c > @@ -84,7 +84,7 @@ struct spi_flash *spi_flash_probe(unsigned int busnum, unsigned int cs, > void spi_flash_free(struct spi_flash *flash) > { > if (CONFIG_IS_ENABLED(SPI_FLASH_MTD)) > - spi_flash_mtd_unregister(); > + spi_flash_mtd_unregister(flash); > > spi_free_slave(flash->spi); > free(flash); > @@ -143,8 +143,10 @@ int spi_flash_std_probe(struct udevice *dev) > > static int spi_flash_std_remove(struct udevice *dev) > { > + struct spi_flash *flash = dev_get_uclass_priv(dev); > + > if (CONFIG_IS_ENABLED(SPI_FLASH_MTD)) > - spi_flash_mtd_unregister(); > + spi_flash_mtd_unregister(flash); > > return 0; > } > -- > 2.26.2 >