diff options
| author | Tom Rini <trini@ti.com> | 2013-12-10 09:36:23 -0500 | 
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-12-10 09:36:23 -0500 | 
| commit | 65b7fe28a12bbaccc7a0c076f5f9f213150030e7 (patch) | |
| tree | 96be894262501d04c9bb637a837180b7708e49e8 /drivers/spi/exynos_spi.c | |
| parent | e1e3de79515b95712a41f52c86a0181530f2fc03 (diff) | |
| parent | ca9a501953ce945da8e76d86a0ddf070a7f729b8 (diff) | |
| download | olio-uboot-2014.01-65b7fe28a12bbaccc7a0c076f5f9f213150030e7.tar.xz olio-uboot-2014.01-65b7fe28a12bbaccc7a0c076f5f9f213150030e7.zip | |
Merge branch 'spi' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'drivers/spi/exynos_spi.c')
| -rw-r--r-- | drivers/spi/exynos_spi.c | 10 | 
1 files changed, 5 insertions, 5 deletions
| diff --git a/drivers/spi/exynos_spi.c b/drivers/spi/exynos_spi.c index 699c57eb6..4d5def2d3 100644 --- a/drivers/spi/exynos_spi.c +++ b/drivers/spi/exynos_spi.c @@ -529,18 +529,18 @@ static int process_nodes(const void *blob, int node_list[], int count)   * @param node		SPI peripheral node to use   * @return 0 if ok, -1 on error   */ -struct spi_slave *spi_setup_slave_fdt(const void *blob, int node, -		unsigned int cs, unsigned int max_hz, unsigned int mode) +struct spi_slave *spi_setup_slave_fdt(const void *blob, int slave_node, +				      int spi_node)  {  	struct spi_bus *bus;  	unsigned int i;  	for (i = 0, bus = spi_bus; i < bus_count; i++, bus++) { -		if (bus->node == node) -			return spi_setup_slave(i, cs, max_hz, mode); +		if (bus->node == spi_node) +			return spi_base_setup_slave_fdt(blob, i, slave_node);  	} -	debug("%s: Failed to find bus node %d\n", __func__, node); +	debug("%s: Failed to find bus node %d\n", __func__, spi_node);  	return NULL;  } |