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

dm: spi: Remove use of fdtdec GPIO support 

These functions are going away, so use the new uclass support instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2015-01-05 20:05:40 -07:00
parent 46927e1ef4
commit 050fb909b6
1 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
drivers/spi/soft_spi.c
View File

@ -21,10 +21,10 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
struct soft_spi_platdata { struct soft_spi_platdata {
struct fdt_gpio_state cs; struct gpio_desc cs;
struct fdt_gpio_state sclk; struct gpio_desc sclk;
struct fdt_gpio_state mosi; struct gpio_desc mosi;
struct fdt_gpio_state miso; struct gpio_desc miso;
int spi_delay_us; int spi_delay_us;
}; };
@ -35,9 +35,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 soft_spi_platdata *plat = dev->platdata;
struct soft_spi_priv *priv = dev_get_priv(dev);
gpio_set_value(plat->sclk.gpio, priv->mode & SPI_CPOL ? bit : !bit); dm_gpio_set_value(&plat->sclk, bit);
return 0; return 0;
} }
@ -46,7 +45,7 @@ static int soft_spi_sda(struct udevice *dev, int bit)
{ {
struct soft_spi_platdata *plat = dev->platdata; struct soft_spi_platdata *plat = dev->platdata;
gpio_set_value(plat->mosi.gpio, bit); dm_gpio_set_value(&plat->mosi, bit);
return 0; return 0;
} }
@ -54,11 +53,10 @@ 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 soft_spi_platdata *plat = dev->platdata;
struct soft_spi_priv *priv = dev_get_priv(dev);
gpio_set_value(plat->cs.gpio, !(priv->mode & SPI_CS_HIGH)); dm_gpio_set_value(&plat->cs, 0);
gpio_set_value(plat->sclk.gpio, priv->mode & SPI_CPOL); dm_gpio_set_value(&plat->sclk, 0);
gpio_set_value(plat->cs.gpio, priv->mode & SPI_CS_HIGH); dm_gpio_set_value(&plat->cs, 1);
return 0; return 0;
} }
@ -66,9 +64,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 soft_spi_platdata *plat = dev->platdata;
struct soft_spi_priv *priv = dev_get_priv(dev);
gpio_set_value(plat->cs.gpio, !(priv->mode & SPI_CS_HIGH)); dm_gpio_set_value(&plat->cs, 0);
return 0; return 0;
} }
@ -109,7 +106,6 @@ static int soft_spi_xfer(struct udevice *dev, unsigned int bitlen,
uchar tmpdout = 0; uchar tmpdout = 0;
const u8 *txd = dout; const u8 *txd = dout;
u8 *rxd = din; u8 *rxd = din;
int cpol = priv->mode & SPI_CPOL;
int cpha = priv->mode & SPI_CPHA; int cpha = priv->mode & SPI_CPHA;
unsigned int j; unsigned int j;
@ -137,19 +133,19 @@ static int soft_spi_xfer(struct udevice *dev, unsigned int bitlen,
} }
if (!cpha) if (!cpha)
soft_spi_scl(dev, !cpol); 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, !cpol); soft_spi_scl(dev, 0);
else else
soft_spi_scl(dev, cpol); soft_spi_scl(dev, 1);
tmpdin <<= 1; tmpdin <<= 1;
tmpdin |= gpio_get_value(plat->miso.gpio); tmpdin |= dm_gpio_get_value(&plat->miso);
tmpdout <<= 1; tmpdout <<= 1;
udelay(plat->spi_delay_us); udelay(plat->spi_delay_us);
if (cpha) if (cpha)
soft_spi_scl(dev, cpol); soft_spi_scl(dev, 1);
} }
/* /*
* If the number of bits isn't a multiple of 8, shift the last * If the number of bits isn't a multiple of 8, shift the last
@ -205,11 +201,6 @@ static int soft_spi_ofdata_to_platdata(struct udevice *dev)
const void *blob = gd->fdt_blob; const void *blob = gd->fdt_blob;
int node = dev->of_offset; int node = dev->of_offset;
if (fdtdec_decode_gpio(blob, node, "cs-gpio", &plat->cs) ||
fdtdec_decode_gpio(blob, node, "sclk-gpio", &plat->sclk) ||
fdtdec_decode_gpio(blob, node, "mosi-gpio", &plat->mosi) ||
fdtdec_decode_gpio(blob, node, "miso-gpio", &plat->miso))
return -EINVAL;
plat->spi_delay_us = fdtdec_get_int(blob, node, "spi-delay-us", 0); plat->spi_delay_us = fdtdec_get_int(blob, node, "spi-delay-us", 0);
return 0; return 0;
@ -219,16 +210,19 @@ static int soft_spi_probe(struct udevice *dev)
{ {
struct spi_slave *slave = dev_get_parentdata(dev); struct spi_slave *slave = dev_get_parentdata(dev);
struct soft_spi_platdata *plat = dev->platdata; struct soft_spi_platdata *plat = dev->platdata;
int cs_flags, clk_flags;
gpio_request(plat->cs.gpio, "soft_spi_cs"); cs_flags = (slave->mode & SPI_CS_HIGH) ? 0 : GPIOD_ACTIVE_LOW;
gpio_request(plat->sclk.gpio, "soft_spi_sclk"); clk_flags = (slave->mode & SPI_CPOL) ? GPIOD_ACTIVE_LOW : 0;
gpio_request(plat->mosi.gpio, "soft_spi_mosi"); if (gpio_request_by_name(dev, "cs-gpio", 0, &plat->cs,
gpio_request(plat->miso.gpio, "soft_spi_miso"); GPIOD_IS_OUT | cs_flags) ||
gpio_request_by_name(dev, "sclk-gpio", 0, &plat->sclk,
gpio_direction_output(plat->sclk.gpio, slave->mode & SPI_CPOL); GPIOD_IS_OUT | clk_flags) ||
gpio_direction_output(plat->mosi.gpio, 1); gpio_request_by_name(dev, "mosi-gpio", 0, &plat->mosi,
gpio_direction_input(plat->miso.gpio); GPIOD_IS_OUT | GPIOD_IS_OUT_ACTIVE) ||
gpio_direction_output(plat->cs.gpio, !(slave->mode & SPI_CS_HIGH)); gpio_request_by_name(dev, "miso-gpio", 0, &plat->miso,
GPIOD_IS_IN))
return -EINVAL;
return 0; return 0;
} }