V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

dm: spi: Correct SPI claim/release_bus() methods 

These methods should be passed a slave device, not a bus. This matches the
old SPI interface. It is important to know which device is claiming the bus
so passing a bus is not that useful.

Reported-by: Haikun Wang <haikun.wang@freescale.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
Tested-by: Peng Fan <Peng.Fan@freescale.com>
Reviewed-by: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
This commit is contained in:
Simon Glass 2015-04-19 09:05:40 -06:00 committed by Jagannadha Sutradharudu Teki
parent 4fbad92e73
commit 9694b72442
6 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/spi/exynos_spi.c
View File

@ -296,8 +296,9 @@ static int exynos_spi_probe(struct udevice *bus)
return 0; return 0;
} }
static int exynos_spi_claim_bus(struct udevice *bus) static int exynos_spi_claim_bus(struct udevice *dev)
{ {
struct udevice *bus = dev->parent;
struct exynos_spi_priv *priv = dev_get_priv(bus); struct exynos_spi_priv *priv = dev_get_priv(bus);
exynos_pinmux_config(priv->periph_id, PINMUX_FLAG_NONE); exynos_pinmux_config(priv->periph_id, PINMUX_FLAG_NONE);
@ -308,8 +309,9 @@ static int exynos_spi_claim_bus(struct udevice *bus)
return 0; return 0;
} }
static int exynos_spi_release_bus(struct udevice *bus) static int exynos_spi_release_bus(struct udevice *dev)
{ {
struct udevice *bus = dev->parent;
struct exynos_spi_priv *priv = dev_get_priv(bus); struct exynos_spi_priv *priv = dev_get_priv(bus);
spi_flush_fifo(priv->regs); spi_flush_fifo(priv->regs);

4
drivers/spi/spi-uclass.c
View File

@ -67,7 +67,7 @@ int spi_claim_bus(struct spi_slave *slave)
if (ret) if (ret)
return ret; return ret;
return ops->claim_bus ? ops->claim_bus(bus) : 0; return ops->claim_bus ? ops->claim_bus(dev) : 0;
} }
void spi_release_bus(struct spi_slave *slave) void spi_release_bus(struct spi_slave *slave)
@ -77,7 +77,7 @@ void spi_release_bus(struct spi_slave *slave)
struct dm_spi_ops *ops = spi_get_ops(bus); struct dm_spi_ops *ops = spi_get_ops(bus);
if (ops->release_bus) if (ops->release_bus)
ops->release_bus(bus); ops->release_bus(dev);
} }
int spi_xfer(struct spi_slave *slave, unsigned int bitlen, int spi_xfer(struct spi_slave *slave, unsigned int bitlen,

3
drivers/spi/tegra114_spi.c
View File

@ -153,8 +153,9 @@ static int tegra114_spi_probe(struct udevice *bus)
return 0; return 0;
} }
static int tegra114_spi_claim_bus(struct udevice *bus) static int tegra114_spi_claim_bus(struct udevice *dev)
{ {
struct udevice *bus = dev->parent;
struct tegra114_spi_priv *priv = dev_get_priv(bus); struct tegra114_spi_priv *priv = dev_get_priv(bus);
struct spi_regs *regs = priv->regs; struct spi_regs *regs = priv->regs;

3
drivers/spi/tegra20_sflash.c
View File

@ -125,8 +125,9 @@ static int tegra20_sflash_probe(struct udevice *bus)
return 0; return 0;
} }
static int tegra20_sflash_claim_bus(struct udevice *bus) static int tegra20_sflash_claim_bus(struct udevice *dev)
{ {
struct udevice *bus = dev->parent;
struct tegra20_sflash_priv *priv = dev_get_priv(bus); struct tegra20_sflash_priv *priv = dev_get_priv(bus);
struct spi_regs *regs = priv->regs; struct spi_regs *regs = priv->regs;
u32 reg; u32 reg;

3
drivers/spi/tegra20_slink.c
View File

@ -141,8 +141,9 @@ static int tegra30_spi_probe(struct udevice *bus)
return 0; return 0;
} }
static int tegra30_spi_claim_bus(struct udevice *bus) static int tegra30_spi_claim_bus(struct udevice *dev)
{ {
struct udevice *bus = dev->parent;
struct tegra30_spi_priv *priv = dev_get_priv(bus); struct tegra30_spi_priv *priv = dev_get_priv(bus);
struct spi_regs *regs = priv->regs; struct spi_regs *regs = priv->regs;
u32 reg; u32 reg;

10
include/spi.h
View File

@ -386,12 +386,12 @@ struct dm_spi_ops {
* allowed to claim the same bus for several slaves without releasing * allowed to claim the same bus for several slaves without releasing
* the bus in between. * the bus in between.
* *
* @bus: The SPI slave * @dev: The SPI slave
* *
* Returns: 0 if the bus was claimed successfully, or a negative value * Returns: 0 if the bus was claimed successfully, or a negative value
* if it wasn't. * if it wasn't.
*/ */
int (*claim_bus)(struct udevice *bus); int (*claim_bus)(struct udevice *dev);
/** /**
* Release the SPI bus * Release the SPI bus
@ -400,9 +400,9 @@ struct dm_spi_ops {
* all transfers have finished. It may disable any SPI hardware as * all transfers have finished. It may disable any SPI hardware as
* appropriate. * 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 * Set the word length for SPI transactions
@ -414,7 +414,7 @@ struct dm_spi_ops {
* *
* Returns: 0 on success, -ve on failure. * 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 * SPI transfer