Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-28 08:35:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

spi: atmel: Add ifdef for DM_GPIO code

Browse source 
Few boards are configuring gpio directly from board instead
using drivers/gpio so add ifdef for DM_GPIO to compatible
for both the cases.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Acked-by: Wenyou Yang <wenyouya@gmail.com>
This commit is contained in:
Jagan Teki 2018-03-14 18:46:31 +05:30 • committed by Tom Rini
parent 6074c3879c
commit 9bf48e2ee8
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/spi/atmel_spi.c
View file

@ -236,7 +236,9 @@ struct atmel_spi_priv {
unsigned int freq; /* Default frequency */ unsigned int freq; /* Default frequency */
unsigned int mode; unsigned int mode;
ulong bus_clk_rate; ulong bus_clk_rate;
#ifdef CONFIG_DM_GPIO
struct gpio_desc cs_gpios[MAX_CS_COUNT]; struct gpio_desc cs_gpios[MAX_CS_COUNT];
#endif
}; };
static int atmel_spi_claim_bus(struct udevice *dev) static int atmel_spi_claim_bus(struct udevice *dev)
@ -291,6 +293,7 @@ static int atmel_spi_release_bus(struct udevice *dev)
static void atmel_spi_cs_activate(struct udevice *dev) static void atmel_spi_cs_activate(struct udevice *dev)
{ {
#ifdef CONFIG_DM_GPIO
struct udevice *bus = dev_get_parent(dev); struct udevice *bus = dev_get_parent(dev);
struct atmel_spi_priv *priv = dev_get_priv(bus); struct atmel_spi_priv *priv = dev_get_priv(bus);
struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev);
@ -300,10 +303,12 @@ static void atmel_spi_cs_activate(struct udevice *dev)
return; return;
dm_gpio_set_value(&priv->cs_gpios[cs], 0); dm_gpio_set_value(&priv->cs_gpios[cs], 0);
#endif
} }
static void atmel_spi_cs_deactivate(struct udevice *dev) static void atmel_spi_cs_deactivate(struct udevice *dev)
{ {
#ifdef CONFIG_DM_GPIO
struct udevice *bus = dev_get_parent(dev); struct udevice *bus = dev_get_parent(dev);
struct atmel_spi_priv *priv = dev_get_priv(bus); struct atmel_spi_priv *priv = dev_get_priv(bus);
struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev); struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev);
@ -313,6 +318,7 @@ static void atmel_spi_cs_deactivate(struct udevice *dev)
return; return;
dm_gpio_set_value(&priv->cs_gpios[cs], 1); dm_gpio_set_value(&priv->cs_gpios[cs], 1);
#endif
} }
static int atmel_spi_xfer(struct udevice *dev, unsigned int bitlen, static int atmel_spi_xfer(struct udevice *dev, unsigned int bitlen,
@ -462,8 +468,7 @@ static int atmel_spi_enable_clk(struct udevice *bus)
static int atmel_spi_probe(struct udevice *bus) static int atmel_spi_probe(struct udevice *bus)
{ {
struct atmel_spi_platdata *bus_plat = dev_get_platdata(bus); struct atmel_spi_platdata *bus_plat = dev_get_platdata(bus);
struct atmel_spi_priv *priv = dev_get_priv(bus); int ret;
int i, ret;
ret = atmel_spi_enable_clk(bus); ret = atmel_spi_enable_clk(bus);
if (ret) if (ret)
@ -471,6 +476,10 @@ static int atmel_spi_probe(struct udevice *bus)
bus_plat->regs = (struct at91_spi *)devfdt_get_addr(bus); bus_plat->regs = (struct at91_spi *)devfdt_get_addr(bus);
#ifdef CONFIG_DM_GPIO
struct atmel_spi_priv *priv = dev_get_priv(bus);
int i;
ret = gpio_request_list_by_name(bus, "cs-gpios", priv->cs_gpios, ret = gpio_request_list_by_name(bus, "cs-gpios", priv->cs_gpios,
ARRAY_SIZE(priv->cs_gpios), 0); ARRAY_SIZE(priv->cs_gpios), 0);
if (ret < 0) { if (ret < 0) {
@ -485,6 +494,7 @@ static int atmel_spi_probe(struct udevice *bus)
dm_gpio_set_dir_flags(&priv->cs_gpios[i], dm_gpio_set_dir_flags(&priv->cs_gpios[i],
GPIOD_IS_OUT | GPIOD_IS_OUT_ACTIVE); GPIOD_IS_OUT | GPIOD_IS_OUT_ACTIVE);
} }
#endif
writel(ATMEL_SPI_CR_SWRST, &bus_plat->regs->cr); writel(ATMEL_SPI_CR_SWRST, &bus_plat->regs->cr);