Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-13 15:03:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-spi

Browse Source
This commit is contained in:
Tom Rini
2015-04-28 07:28:43 -04:00
parent 86e6f7eaa1 c650ca7b4c
commit cc555bd4f4
14 changed files with 93 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/spi.h
View File

@@ -38,11 +38,12 @@
/* SPI RX operation modes */
#define SPI_OPM_RX_AS (1 << 0)
#define SPI_OPM_RX_DOUT (1 << 1)
#define SPI_OPM_RX_DIO (1 << 2)
#define SPI_OPM_RX_QOF (1 << 3)
#define SPI_OPM_RX_QIOF (1 << 4)
#define SPI_OPM_RX_EXTN (SPI_OPM_RX_AS | SPI_OPM_RX_DOUT | \
#define SPI_OPM_RX_AF (1 << 1)
#define SPI_OPM_RX_DOUT (1 << 2)
#define SPI_OPM_RX_DIO (1 << 3)
#define SPI_OPM_RX_QOF (1 << 4)
#define SPI_OPM_RX_QIOF (1 << 5)
#define SPI_OPM_RX_EXTN (SPI_OPM_RX_AS | SPI_OPM_RX_AF | SPI_OPM_RX_DOUT | \
SPI_OPM_RX_DIO | SPI_OPM_RX_QOF | \
SPI_OPM_RX_QIOF)
@@ -385,12 +386,12 @@ struct dm_spi_ops {
* allowed to claim the same bus for several slaves without releasing
* the bus in between.
*
* @bus: The SPI slave
* @dev: The SPI slave
*
* Returns: 0 if the bus was claimed successfully, or a negative value
* if it wasn't.
*/
int (*claim_bus)(struct udevice *bus);
int (*claim_bus)(struct udevice *dev);
/**
* Release the SPI bus
@@ -399,9 +400,9 @@ struct dm_spi_ops {
* all transfers have finished. It may disable any SPI hardware as
* appropriate.
*
* @bus: The SPI slave
* @dev: The SPI slave
*/
int (*release_bus)(struct udevice *bus);
int (*release_bus)(struct udevice *dev);
/**
* Set the word length for SPI transactions
@@ -413,7 +414,7 @@ struct dm_spi_ops {
*
* Returns: 0 on success, -ve on failure.
*/
int (*set_wordlen)(struct udevice *bus, unsigned int wordlen);
int (*set_wordlen)(struct udevice *dev, unsigned int wordlen);
/**
* SPI transfer

9
include/spi_flash.h
View File

@@ -62,11 +62,10 @@ struct spi_slave;
* return 0 - Success, 1 - Failure
*/
struct spi_flash {
struct spi_slave *spi;
#ifdef CONFIG_DM_SPI_FLASH
struct spi_slave *spi;
struct udevice *dev;
#else
struct spi_slave *spi;
u16 flags;
#endif
const char *name;
u8 dual_flash;
@@ -91,13 +90,13 @@ struct spi_flash {
#ifndef CONFIG_DM_SPI_FLASH
/*
* These are not strictly needed for driver model, but keep them here
* whilt the transition is in progress.
* while the transition is in progress.
*
* Normally each driver would provide its own operations, but for
* SPI flash most chips use the same algorithms. One approach is
* to create a 'common' SPI flash device which knows how to talk
* to most devices, and then allow other drivers to be used instead
* if requird, perhaps with a way of scanning through the list to
* if required, perhaps with a way of scanning through the list to
* find the driver that matches the device.
*/
int (*read)(struct spi_flash *flash, u32 offset, size_t len, void *buf);