From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jagan Teki Date: Mon, 15 Feb 2016 02:18:09 +0530 Subject: [U-Boot] [PATCH v6 10/76] mtd: spi-nor: Add spi_flash_probe for mtd-dm-spi-nor In-Reply-To: <1455482955-19053-1-git-send-email-jteki@openedev.com> References: <1455482955-19053-1-git-send-email-jteki@openedev.com> Message-ID: <1455482955-19053-10-git-send-email-jteki@openedev.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de While probing spi-nor in SPL spi_flash_probe is needed, so add the flash probe code in spi-nor-probe.c Cc: Simon Glass Cc: Bin Meng Cc: Mugunthan V N Cc: Michal Simek Cc: Siva Durga Prasad Paladugu Signed-off-by: Jagan Teki --- drivers/mtd/spi-nor/spi-nor-probe.c | 15 +++++++++++++++ include/spi_flash.h | 6 ++++++ 2 files changed, 21 insertions(+) diff --git a/drivers/mtd/spi-nor/spi-nor-probe.c b/drivers/mtd/spi-nor/spi-nor-probe.c index c808a7d..9bc61ea 100644 --- a/drivers/mtd/spi-nor/spi-nor-probe.c +++ b/drivers/mtd/spi-nor/spi-nor-probe.c @@ -9,6 +9,21 @@ #include #include +/* + * TODO(sjg at chromium.org): This is an old-style function. We should remove + * it when all SPI flash drivers use dm + */ +spi_flash_t *spi_flash_probe(unsigned int bus, unsigned int cs, + unsigned int max_hz, unsigned int spi_mode) +{ + struct udevice *dev; + + if (spi_flash_probe_bus_cs(bus, cs, max_hz, spi_mode, &dev)) + return NULL; + + return dev_get_uclass_priv(dev); +} + int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs, unsigned int max_hz, unsigned int spi_mode, struct udevice **devp) diff --git a/include/spi_flash.h b/include/spi_flash.h index db07b99..45fda7a 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -110,10 +110,16 @@ struct spi_flash { #if defined(CONFIG_MTD_SPI_NOR) && defined(CONFIG_MTD_DM_SPI_NOR) +typedef struct mtd_info spi_flash_t; + int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs, unsigned int max_hz, unsigned int spi_mode, struct udevice **devp); +/* Compatibility function - this is the old U-Boot API */ +spi_flash_t *spi_flash_probe(unsigned int bus, unsigned int cs, + unsigned int max_hz, unsigned int spi_mode); + #endif struct dm_spi_flash_ops { -- 1.9.1