qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: spi: soft_spi bug fix 

When doing xfer, should use device->parent, but not device
When doing bit xfer, should use "!!(tmpdout & 0x80)", but not
"(tmpdout & 0x80)"

Signed-off-by: Peng Fan <van.freenix@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Jagan Teki <jteki@openedev.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Peng Fan 2016-05-03 10:02:20 +08:00 committed by Simon Glass
parent 35732098db
commit b6d54d5273
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/spi/soft_spi.c
View File

@ -34,7 +34,8 @@ struct soft_spi_priv {
static int soft_spi_scl(struct udevice *dev, int bit) static int soft_spi_scl(struct udevice *dev, int bit)
{ {
struct soft_spi_platdata *plat = dev->platdata; struct udevice *bus = dev_get_parent(dev);
struct soft_spi_platdata *plat = dev_get_platdata(bus);
dm_gpio_set_value(&plat->sclk, bit); dm_gpio_set_value(&plat->sclk, bit);
@ -43,7 +44,8 @@ static int soft_spi_scl(struct udevice *dev, int bit)
static int soft_spi_sda(struct udevice *dev, int bit) static int soft_spi_sda(struct udevice *dev, int bit)
{ {
struct soft_spi_platdata *plat = dev->platdata; struct udevice *bus = dev_get_parent(dev);
struct soft_spi_platdata *plat = dev_get_platdata(bus);
dm_gpio_set_value(&plat->mosi, bit); dm_gpio_set_value(&plat->mosi, bit);
@ -52,7 +54,8 @@ static int soft_spi_sda(struct udevice *dev, int bit)
static int soft_spi_cs_activate(struct udevice *dev) static int soft_spi_cs_activate(struct udevice *dev)
{ {
struct soft_spi_platdata *plat = dev->platdata; struct udevice *bus = dev_get_parent(dev);
struct soft_spi_platdata *plat = dev_get_platdata(bus);
dm_gpio_set_value(&plat->cs, 0); dm_gpio_set_value(&plat->cs, 0);
dm_gpio_set_value(&plat->sclk, 0); dm_gpio_set_value(&plat->sclk, 0);
@ -63,7 +66,8 @@ static int soft_spi_cs_activate(struct udevice *dev)
static int soft_spi_cs_deactivate(struct udevice *dev) static int soft_spi_cs_deactivate(struct udevice *dev)
{ {
struct soft_spi_platdata *plat = dev->platdata; struct udevice *bus = dev_get_parent(dev);
struct soft_spi_platdata *plat = dev_get_platdata(bus);
dm_gpio_set_value(&plat->cs, 0); dm_gpio_set_value(&plat->cs, 0);
@ -100,8 +104,9 @@ static int soft_spi_release_bus(struct udevice *dev)
static int soft_spi_xfer(struct udevice *dev, unsigned int bitlen, static int soft_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 soft_spi_priv *priv = dev_get_priv(dev); struct udevice *bus = dev_get_parent(dev);
struct soft_spi_platdata *plat = dev->platdata; struct soft_spi_priv *priv = dev_get_priv(bus);
struct soft_spi_platdata *plat = dev_get_platdata(bus);
uchar tmpdin = 0; uchar tmpdin = 0;
uchar tmpdout = 0; uchar tmpdout = 0;
const u8 *txd = dout; const u8 *txd = dout;
@ -134,7 +139,7 @@ static int soft_spi_xfer(struct udevice *dev, unsigned int bitlen,
if (!cpha) if (!cpha)
soft_spi_scl(dev, 0); soft_spi_scl(dev, 0);
soft_spi_sda(dev, tmpdout & 0x80); soft_spi_sda(dev, !!(tmpdout & 0x80));
udelay(plat->spi_delay_us); udelay(plat->spi_delay_us);
if (cpha) if (cpha)
soft_spi_scl(dev, 0); soft_spi_scl(dev, 0);