dm: spi: introduce dm api
Introduce dm_spi_claim_bus, dm_spi_release_bus and dm_spi_xfer Convert spi_claim_bus, spi_release_bus and spi_xfer to use the new API. Signed-off-by: Peng Fan <van.freenix@gmail.com> Cc: Simon Glass <sjg@chromium.org> Cc: Jagan Teki <jteki@openedev.com> Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
102412c415
commit
7a3eff4ce9
|
|
@ -45,12 +45,12 @@ static int spi_set_speed_mode(struct udevice *bus, int speed, int mode)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int spi_claim_bus(struct spi_slave *slave)
|
int dm_spi_claim_bus(struct udevice *dev)
|
||||||
{
|
{
|
||||||
struct udevice *dev = slave->dev;
|
|
||||||
struct udevice *bus = dev->parent;
|
struct udevice *bus = dev->parent;
|
||||||
struct dm_spi_ops *ops = spi_get_ops(bus);
|
struct dm_spi_ops *ops = spi_get_ops(bus);
|
||||||
struct dm_spi_bus *spi = dev_get_uclass_priv(bus);
|
struct dm_spi_bus *spi = dev_get_uclass_priv(bus);
|
||||||
|
struct spi_slave *slave = dev_get_parent_priv(dev);
|
||||||
int speed;
|
int speed;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
|
@ -73,9 +73,8 @@ int spi_claim_bus(struct spi_slave *slave)
|
||||||
return ops->claim_bus ? ops->claim_bus(dev) : 0;
|
return ops->claim_bus ? ops->claim_bus(dev) : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void spi_release_bus(struct spi_slave *slave)
|
void dm_spi_release_bus(struct udevice *dev)
|
||||||
{
|
{
|
||||||
struct udevice *dev = slave->dev;
|
|
||||||
struct udevice *bus = dev->parent;
|
struct udevice *bus = dev->parent;
|
||||||
struct dm_spi_ops *ops = spi_get_ops(bus);
|
struct dm_spi_ops *ops = spi_get_ops(bus);
|
||||||
|
|
||||||
|
|
@ -83,10 +82,9 @@ void spi_release_bus(struct spi_slave *slave)
|
||||||
ops->release_bus(dev);
|
ops->release_bus(dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
int spi_xfer(struct spi_slave *slave, unsigned int bitlen,
|
int dm_spi_xfer(struct udevice *dev, unsigned int bitlen,
|
||||||
const void *dout, void *din, unsigned long flags)
|
const void *dout, void *din, unsigned long flags)
|
||||||
{
|
{
|
||||||
struct udevice *dev = slave->dev;
|
|
||||||
struct udevice *bus = dev->parent;
|
struct udevice *bus = dev->parent;
|
||||||
|
|
||||||
if (bus->uclass->uc_drv->id != UCLASS_SPI)
|
if (bus->uclass->uc_drv->id != UCLASS_SPI)
|
||||||
|
|
@ -95,6 +93,22 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen,
|
||||||
return spi_get_ops(bus)->xfer(dev, bitlen, dout, din, flags);
|
return spi_get_ops(bus)->xfer(dev, bitlen, dout, din, flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int spi_claim_bus(struct spi_slave *slave)
|
||||||
|
{
|
||||||
|
return dm_spi_claim_bus(slave->dev);
|
||||||
|
}
|
||||||
|
|
||||||
|
void spi_release_bus(struct spi_slave *slave)
|
||||||
|
{
|
||||||
|
dm_spi_release_bus(slave->dev);
|
||||||
|
}
|
||||||
|
|
||||||
|
int spi_xfer(struct spi_slave *slave, unsigned int bitlen,
|
||||||
|
const void *dout, void *din, unsigned long flags)
|
||||||
|
{
|
||||||
|
return dm_spi_xfer(slave->dev, bitlen, dout, din, flags);
|
||||||
|
}
|
||||||
|
|
||||||
static int spi_post_bind(struct udevice *dev)
|
static int spi_post_bind(struct udevice *dev)
|
||||||
{
|
{
|
||||||
/* Scan the bus for devices */
|
/* Scan the bus for devices */
|
||||||
|
|
|
||||||
|
|
@ -612,6 +612,58 @@ int sandbox_spi_get_emul(struct sandbox_state *state,
|
||||||
struct udevice *bus, struct udevice *slave,
|
struct udevice *bus, struct udevice *slave,
|
||||||
struct udevice **emulp);
|
struct udevice **emulp);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Claim the bus and prepare it for communication with a given slave.
|
||||||
|
*
|
||||||
|
* This must be called before doing any transfers with a SPI slave. It
|
||||||
|
* will enable and initialize any SPI hardware as necessary, and make
|
||||||
|
* sure that the SCK line is in the correct idle state. It is not
|
||||||
|
* allowed to claim the same bus for several slaves without releasing
|
||||||
|
* the bus in between.
|
||||||
|
*
|
||||||
|
* @dev: The SPI slave device
|
||||||
|
*
|
||||||
|
* Returns: 0 if the bus was claimed successfully, or a negative value
|
||||||
|
* if it wasn't.
|
||||||
|
*/
|
||||||
|
int dm_spi_claim_bus(struct udevice *dev);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Release the SPI bus
|
||||||
|
*
|
||||||
|
* This must be called once for every call to dm_spi_claim_bus() after
|
||||||
|
* all transfers have finished. It may disable any SPI hardware as
|
||||||
|
* appropriate.
|
||||||
|
*
|
||||||
|
* @slave: The SPI slave device
|
||||||
|
*/
|
||||||
|
void dm_spi_release_bus(struct udevice *dev);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* SPI transfer
|
||||||
|
*
|
||||||
|
* This writes "bitlen" bits out the SPI MOSI port and simultaneously clocks
|
||||||
|
* "bitlen" bits in the SPI MISO port. That's just the way SPI works.
|
||||||
|
*
|
||||||
|
* The source of the outgoing bits is the "dout" parameter and the
|
||||||
|
* destination of the input bits is the "din" parameter. Note that "dout"
|
||||||
|
* and "din" can point to the same memory location, in which case the
|
||||||
|
* input data overwrites the output data (since both are buffered by
|
||||||
|
* temporary variables, this is OK).
|
||||||
|
*
|
||||||
|
* dm_spi_xfer() interface:
|
||||||
|
* @dev: The SPI slave device which will be sending/receiving the data.
|
||||||
|
* @bitlen: How many bits to write and read.
|
||||||
|
* @dout: Pointer to a string of bits to send out. The bits are
|
||||||
|
* held in a byte array and are sent MSB first.
|
||||||
|
* @din: Pointer to a string of bits that will be filled in.
|
||||||
|
* @flags: A bitwise combination of SPI_XFER_* flags.
|
||||||
|
*
|
||||||
|
* Returns: 0 on success, not 0 on failure
|
||||||
|
*/
|
||||||
|
int dm_spi_xfer(struct udevice *dev, unsigned int bitlen,
|
||||||
|
const void *dout, void *din, unsigned long flags);
|
||||||
|
|
||||||
/* Access the operations for a SPI device */
|
/* Access the operations for a SPI device */
|
||||||
#define spi_get_ops(dev) ((struct dm_spi_ops *)(dev)->driver->ops)
|
#define spi_get_ops(dev) ((struct dm_spi_ops *)(dev)->driver->ops)
|
||||||
#define spi_emul_get_ops(dev) ((struct dm_spi_emul_ops *)(dev)->driver->ops)
|
#define spi_emul_get_ops(dev) ((struct dm_spi_emul_ops *)(dev)->driver->ops)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue