mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-18 01:03:05 +00:00
3feea0ba19
Now, spi_flash_probe_bus_cs() relies on DT for spi speed and mode
and logically calls spi_get_bus_and_cs(). In case spi mode and speed are
not read from DT, make usage of spi_flash_probe() instead.
To sum-up:
- Previous call tree was:
spi_flash_probe() -> spi_flash_probe_bus_cs() -> spi_get_bus_and_cs()
- Current call tree is:
spi_flash_probe() -> _spi_get_bus_and_cs()
spi_flash_probe_bus_cs() -> spi_get_bus_and_cs()
This patch impacts the following :
- cmd/sf.c: if spi mode and/or speed is passed in argument of
do_spi_flash_probe(), call spi_flash_probe() otherwise call
spi_flash_probe_bus_cs().
- drivers/net/fm/fm.c: as by default spi speed and mode was set to
0 and a comment indicates that speed and mode are read from DT,
use spi_flash_probe_bus_cs().
- drivers/net/pfe_eth/pfe_firmware.c: spi speed and mode are not read
from DT by all platforms using this driver, so keep legacy and replace
spi_flash_probe_bus_cs() by spi_flash_probe();
- drivers/net/sni_netsec.c : spi speed and mode are not read from DT,
so replace spi_flash_probe_bus_cs() by spi_flash_probe().
- drivers/usb/gadget/max3420_udc.c: Can't find any platform which make
usage of this driver, nevertheless, keep legacy and replace
spi_get_bus_and_cs() by _spi_get_bus_and_cs().
- env/sf.c: a comment indicates that speed and mode are read
from DT. So use spi_flash_probe_bus_cs().
Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
Cc: Marek Behun <marek.behun@nic.cz>
Cc: Jagan Teki <jagan@amarulasolutions.com>
Cc: Vignesh R <vigneshr@ti.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Ramon Fried <rfried.dev@gmail.com>
Cc: Lukasz Majewski <lukma@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Stefan Roese <sr@denx.de>
Cc: "Pali Rohár" <pali@kernel.org>
Cc: Konstantin Porotchkin <kostap@marvell.com>
Cc: Igal Liberman <igall@marvell.com>
Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: Pratyush Yadav <p.yadav@ti.com>
Cc: Sean Anderson <seanga2@gmail.com>
Cc: Anji J <anji.jagarlmudi@nxp.com>
Cc: Biwen Li <biwen.li@nxp.com>
Cc: Priyanka Jain <priyanka.jain@nxp.com>
Cc: Chaitanya Sakinam <chaitanya.sakinam@nxp.com>
112 lines
2.4 KiB
C
112 lines
2.4 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (c) 2014 Google, Inc
|
|
*/
|
|
|
|
#define LOG_CATEGORY UCLASS_SPI_FLASH
|
|
|
|
#include <common.h>
|
|
#include <dm.h>
|
|
#include <log.h>
|
|
#include <malloc.h>
|
|
#include <spi.h>
|
|
#include <spi_flash.h>
|
|
#include <asm/global_data.h>
|
|
#include <dm/device-internal.h>
|
|
#include "sf_internal.h"
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
int spi_flash_read_dm(struct udevice *dev, u32 offset, size_t len, void *buf)
|
|
{
|
|
return log_ret(sf_get_ops(dev)->read(dev, offset, len, buf));
|
|
}
|
|
|
|
int spi_flash_write_dm(struct udevice *dev, u32 offset, size_t len,
|
|
const void *buf)
|
|
{
|
|
return log_ret(sf_get_ops(dev)->write(dev, offset, len, buf));
|
|
}
|
|
|
|
int spi_flash_erase_dm(struct udevice *dev, u32 offset, size_t len)
|
|
{
|
|
return log_ret(sf_get_ops(dev)->erase(dev, offset, len));
|
|
}
|
|
|
|
int spl_flash_get_sw_write_prot(struct udevice *dev)
|
|
{
|
|
struct dm_spi_flash_ops *ops = sf_get_ops(dev);
|
|
|
|
if (!ops->get_sw_write_prot)
|
|
return -ENOSYS;
|
|
return log_ret(ops->get_sw_write_prot(dev));
|
|
}
|
|
|
|
/*
|
|
* TODO(sjg@chromium.org): This is an old-style function. We should remove
|
|
* it when all SPI flash drivers use dm
|
|
*/
|
|
struct spi_flash *spi_flash_probe(unsigned int busnum, unsigned int cs,
|
|
unsigned int max_hz, unsigned int spi_mode)
|
|
{
|
|
struct spi_slave *slave;
|
|
struct udevice *bus;
|
|
char *str;
|
|
|
|
#if defined(CONFIG_SPL_BUILD) && CONFIG_IS_ENABLED(USE_TINY_PRINTF)
|
|
str = "spi_flash";
|
|
#else
|
|
char name[30];
|
|
|
|
snprintf(name, sizeof(name), "spi_flash@%d:%d", busnum, cs);
|
|
str = strdup(name);
|
|
#endif
|
|
|
|
if (_spi_get_bus_and_cs(busnum, cs, max_hz, spi_mode,
|
|
"jedec_spi_nor", str, &bus, &slave))
|
|
return NULL;
|
|
|
|
return dev_get_uclass_priv(slave->dev);
|
|
}
|
|
|
|
int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs,
|
|
struct udevice **devp)
|
|
{
|
|
struct spi_slave *slave;
|
|
struct udevice *bus;
|
|
int ret;
|
|
|
|
ret = spi_get_bus_and_cs(busnum, cs, &bus, &slave);
|
|
if (ret)
|
|
return ret;
|
|
|
|
*devp = slave->dev;
|
|
return 0;
|
|
}
|
|
|
|
static int spi_flash_post_bind(struct udevice *dev)
|
|
{
|
|
#if defined(CONFIG_NEEDS_MANUAL_RELOC)
|
|
struct dm_spi_flash_ops *ops = sf_get_ops(dev);
|
|
static int reloc_done;
|
|
|
|
if (!reloc_done) {
|
|
if (ops->read)
|
|
ops->read += gd->reloc_off;
|
|
if (ops->write)
|
|
ops->write += gd->reloc_off;
|
|
if (ops->erase)
|
|
ops->erase += gd->reloc_off;
|
|
|
|
reloc_done++;
|
|
}
|
|
#endif
|
|
return 0;
|
|
}
|
|
|
|
UCLASS_DRIVER(spi_flash) = {
|
|
.id = UCLASS_SPI_FLASH,
|
|
.name = "spi_flash",
|
|
.post_bind = spi_flash_post_bind,
|
|
.per_device_auto = sizeof(struct spi_nor),
|
|
};
|