spi: omap3_spi: Fix speed and mode selection
McSPI IP provides per CS specific speed and mode selection. Therefore it
is possible to apply these settings only after CS is known. But
set_speed and set_mode can be called without bus being claimed, this
would lead driver to set up wrong CS (or previously used CS).
Fix this by apply set_speed and set_mode only if bus is already claimed.
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
Tested-by: Miquel Raynal <miquel.raynal@bootlin.com>
diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c
index 78e2a25..7493176 100644
--- a/drivers/spi/omap3_spi.c
+++ b/drivers/spi/omap3_spi.c
@@ -37,6 +37,8 @@
unsigned int mode;
unsigned int wordlen;
unsigned int pin_dir:1;
+
+ bool bus_claimed;
};
static void omap3_spi_write_chconf(struct omap3_spi_priv *priv, int val)
@@ -372,6 +374,8 @@
conf |= OMAP3_MCSPI_MODULCTRL_SINGLE;
writel(conf, &priv->regs->modulctrl);
+
+ priv->bus_claimed = true;
}
static int omap3_spi_claim_bus(struct udevice *dev)
@@ -381,9 +385,12 @@
struct dm_spi_slave_plat *slave_plat = dev_get_parent_plat(dev);
priv->cs = slave_plat->cs;
- priv->freq = slave_plat->max_hz;
+ if (!priv->freq)
+ priv->freq = slave_plat->max_hz;
_omap3_spi_claim_bus(priv);
+ _omap3_spi_set_speed(priv);
+ _omap3_spi_set_mode(priv);
return 0;
}
@@ -395,6 +402,8 @@
writel(OMAP3_MCSPI_MODULCTRL_MS, &priv->regs->modulctrl);
+ priv->bus_claimed = false;
+
return 0;
}
@@ -440,7 +449,8 @@
struct omap3_spi_priv *priv = dev_get_priv(dev);
priv->freq = speed;
- _omap3_spi_set_speed(priv);
+ if (priv->bus_claimed)
+ _omap3_spi_set_speed(priv);
return 0;
}
@@ -451,7 +461,8 @@
priv->mode = mode;
- _omap3_spi_set_mode(priv);
+ if (priv->bus_claimed)
+ _omap3_spi_set_mode(priv);
return 0;
}