mirror of
				https://github.com/smaeul/u-boot.git
				synced 2025-11-04 05:50:17 +00:00 
			
		
		
		
	This patch adds the flags parameter to device_remove() and changes all calls to this function to provide the default value of DM_REMOVE_NORMAL for "normal" device removal. This is in preparation for the driver specific pre-OS (e.g. DMA cancelling) remove support. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Simon Glass <sjg@chromium.org> Acked-by: Simon Glass <sjg@chromium.org>
		
			
				
	
	
		
			104 lines
		
	
	
		
			2.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			104 lines
		
	
	
		
			2.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Copyright (c) 2014 Google, Inc
 | 
						|
 *
 | 
						|
 * SPDX-License-Identifier:	GPL-2.0+
 | 
						|
 */
 | 
						|
 | 
						|
#include <common.h>
 | 
						|
#include <dm.h>
 | 
						|
#include <spi.h>
 | 
						|
#include <spi_flash.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 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 sf_get_ops(dev)->write(dev, offset, len, buf);
 | 
						|
}
 | 
						|
 | 
						|
int spi_flash_erase_dm(struct udevice *dev, u32 offset, size_t len)
 | 
						|
{
 | 
						|
	return sf_get_ops(dev)->erase(dev, offset, len);
 | 
						|
}
 | 
						|
 | 
						|
/*
 | 
						|
 * 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 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);
 | 
						|
}
 | 
						|
 | 
						|
void spi_flash_free(struct spi_flash *flash)
 | 
						|
{
 | 
						|
	device_remove(flash->spi->dev, DM_REMOVE_NORMAL);
 | 
						|
}
 | 
						|
 | 
						|
int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs,
 | 
						|
			   unsigned int max_hz, unsigned int spi_mode,
 | 
						|
			   struct udevice **devp)
 | 
						|
{
 | 
						|
	struct spi_slave *slave;
 | 
						|
	struct udevice *bus;
 | 
						|
	char *str;
 | 
						|
	int ret;
 | 
						|
 | 
						|
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_USE_TINY_PRINTF)
 | 
						|
	str = "spi_flash";
 | 
						|
#else
 | 
						|
	char name[30];
 | 
						|
 | 
						|
	snprintf(name, sizeof(name), "spi_flash@%d:%d", busnum, cs);
 | 
						|
	str = strdup(name);
 | 
						|
#endif
 | 
						|
	ret = spi_get_bus_and_cs(busnum, cs, max_hz, spi_mode,
 | 
						|
				  "spi_flash_std", str, &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_alloc_size = sizeof(struct spi_flash),
 | 
						|
};
 |