leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: spi: Convert uclass to livetree

Browse Source 
Update the SPI uclass to support a live device tree. Also adjust
spi_slave_ofdata_to_platdata() to accept a device instead of a blob and
offset.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2017-05-18 20:09:54 -06:00
parent 8327d41b19
commit 279e26f5a3
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,6 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <errno.h> #include <errno.h>
#include <fdtdec.h>
#include <malloc.h> #include <malloc.h>
#include <spi.h> #include <spi.h>
#include <dm/device-internal.h> #include <dm/device-internal.h>
@ -113,11 +112,10 @@ static int spi_child_post_bind(struct udevice *dev)
{ {
struct dm_spi_slave_platdata *plat = dev_get_parent_platdata(dev); struct dm_spi_slave_platdata *plat = dev_get_parent_platdata(dev);
if (dev_of_offset(dev) == -1) if (!dev_of_valid(dev))
return 0; return 0;
return spi_slave_ofdata_to_platdata(gd->fdt_blob, dev_of_offset(dev), return spi_slave_ofdata_to_platdata(dev, plat);
plat);
} }
#endif #endif
@ -126,8 +124,7 @@ static int spi_post_probe(struct udevice *bus)
#if !CONFIG_IS_ENABLED(OF_PLATDATA) #if !CONFIG_IS_ENABLED(OF_PLATDATA)
struct dm_spi_bus *spi = dev_get_uclass_priv(bus); struct dm_spi_bus *spi = dev_get_uclass_priv(bus);
spi->max_hz = fdtdec_get_int(gd->fdt_blob, dev_of_offset(bus), spi->max_hz = dev_read_u32_default(bus, "spi-max-frequency", 0);
"spi-max-frequency", 0);
#endif #endif
#if defined(CONFIG_NEEDS_MANUAL_RELOC) #if defined(CONFIG_NEEDS_MANUAL_RELOC)
struct dm_spi_ops *ops = spi_get_ops(bus); struct dm_spi_ops *ops = spi_get_ops(bus);
@ -375,7 +372,7 @@ struct spi_slave *spi_setup_slave(unsigned int busnum, unsigned int cs,
int ret; int ret;
ret = spi_get_bus_and_cs(busnum, cs, speed, mode, NULL, 0, &dev, ret = spi_get_bus_and_cs(busnum, cs, speed, mode, NULL, 0, &dev,
&slave); &slave);
if (ret) if (ret)
return NULL; return NULL;
@ -388,27 +385,27 @@ void spi_free_slave(struct spi_slave *slave)
slave->dev = NULL; slave->dev = NULL;
} }
int spi_slave_ofdata_to_platdata(const void *blob, int node, int spi_slave_ofdata_to_platdata(struct udevice *dev,
struct dm_spi_slave_platdata *plat) struct dm_spi_slave_platdata *plat)
{ {
int mode = 0; int mode = 0;
int value; int value;
plat->cs = fdtdec_get_int(blob, node, "reg", -1); plat->cs = dev_read_u32_default(dev, "reg", -1);
plat->max_hz = fdtdec_get_int(blob, node, "spi-max-frequency", 0); plat->max_hz = dev_read_u32_default(dev, "spi-max-frequency", 0);
if (fdtdec_get_bool(blob, node, "spi-cpol")) if (dev_read_bool(dev, "spi-cpol"))
mode |= SPI_CPOL; mode |= SPI_CPOL;
if (fdtdec_get_bool(blob, node, "spi-cpha")) if (dev_read_bool(dev, "spi-cpha"))
mode |= SPI_CPHA; mode |= SPI_CPHA;
if (fdtdec_get_bool(blob, node, "spi-cs-high")) if (dev_read_bool(dev, "spi-cs-high"))
mode |= SPI_CS_HIGH; mode |= SPI_CS_HIGH;
if (fdtdec_get_bool(blob, node, "spi-3wire")) if (dev_read_bool(dev, "spi-3wire"))
mode |= SPI_3WIRE; mode |= SPI_3WIRE;
if (fdtdec_get_bool(blob, node, "spi-half-duplex")) if (dev_read_bool(dev, "spi-half-duplex"))
mode |= SPI_PREAMBLE; mode |= SPI_PREAMBLE;
/* Device DUAL/QUAD mode */ /* Device DUAL/QUAD mode */
value = fdtdec_get_uint(blob, node, "spi-tx-bus-width", 1); value = dev_read_u32_default(dev, "spi-tx-bus-width", 1);
switch (value) { switch (value) {
case 1: case 1:
break; break;
@ -423,7 +420,7 @@ int spi_slave_ofdata_to_platdata(const void *blob, int node,
break; break;
} }
value = fdtdec_get_uint(blob, node, "spi-rx-bus-width", 1); value = dev_read_u32_default(dev, "spi-rx-bus-width", 1);
switch (value) { switch (value) {
case 1: case 1:
break; break;

2
include/spi.h
View File

@ -562,7 +562,7 @@ int spi_find_chip_select(struct udevice *bus, int cs, struct udevice **devp);
* @node: Node offset to read from * @node: Node offset to read from
* @plat: Place to put the decoded information * @plat: Place to put the decoded information
*/ */
int spi_slave_ofdata_to_platdata(const void *blob, int node, int spi_slave_ofdata_to_platdata(struct udevice *dev,
struct dm_spi_slave_platdata *plat); struct dm_spi_slave_platdata *plat);
/** /**