|
@@ -443,9 +443,6 @@ static void spi_reset(struct mcspi *regs)
|
|
|
static void _omap3_spi_claim_bus(struct omap3_spi_priv *priv)
|
|
|
{
|
|
|
unsigned int conf;
|
|
|
-
|
|
|
- spi_reset(priv->regs);
|
|
|
-
|
|
|
/*
|
|
|
* setup when switching from (reset default) slave mode
|
|
|
* to single-channel master mode
|
|
@@ -480,6 +477,8 @@ int spi_claim_bus(struct spi_slave *slave)
|
|
|
{
|
|
|
struct omap3_spi_priv *priv = to_omap3_spi(slave);
|
|
|
|
|
|
+ spi_reset(priv->regs);
|
|
|
+
|
|
|
_omap3_spi_claim_bus(priv);
|
|
|
_omap3_spi_set_wordlen(priv);
|
|
|
_omap3_spi_set_mode(priv);
|
|
@@ -492,8 +491,7 @@ void spi_release_bus(struct spi_slave *slave)
|
|
|
{
|
|
|
struct omap3_spi_priv *priv = to_omap3_spi(slave);
|
|
|
|
|
|
- /* Reset the SPI hardware */
|
|
|
- spi_reset(priv->regs);
|
|
|
+ writel(OMAP3_MCSPI_MODULCTRL_MS, &priv->regs->modulctrl);
|
|
|
}
|
|
|
|
|
|
struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
|
|
@@ -602,8 +600,7 @@ static int omap3_spi_release_bus(struct udevice *dev)
|
|
|
struct udevice *bus = dev->parent;
|
|
|
struct omap3_spi_priv *priv = dev_get_priv(bus);
|
|
|
|
|
|
- /* Reset the SPI hardware */
|
|
|
- spi_reset(priv->regs);
|
|
|
+ writel(OMAP3_MCSPI_MODULCTRL_MS, &priv->regs->modulctrl);
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
@@ -636,6 +633,9 @@ static int omap3_spi_probe(struct udevice *dev)
|
|
|
else
|
|
|
priv->pin_dir = MCSPI_PINDIR_D0_IN_D1_OUT;
|
|
|
priv->wordlen = SPI_DEFAULT_WORDLEN;
|
|
|
+
|
|
|
+ spi_reset(priv->regs);
|
|
|
+
|
|
|
return 0;
|
|
|
}
|
|
|
|