spi: omap3: fix claim/release bus within DM

[u-boot] / drivers / spi / omap3_spi.c

diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c
index 1ac691a68e7a2404dcaa7a6c2cbbda68bf3dd30f..ecf54bb7148e7d8ca9b80b3d850b92e5e8cd1289 100644 (file)
--- a/drivers/spi/omap3_spi.c
+++ b/drivers/spi/omap3_spi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2016 Jagan Teki <jteki@openedev.com>
  *                   Christophe Ricard <christophe.ricard@gmail.com>
@@ -13,8 +14,6 @@
  * Copyright (C) 2005, 2006 Nokia Corporation
  *
  * Modified by Ruslan Araslanov <ruslan.araslanov@vitecmm.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -444,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
@@ -481,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);
@@ -493,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,
@@ -591,6 +588,8 @@ static int omap3_spi_claim_bus(struct udevice *dev)
        struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev);
 
        priv->cs = slave_plat->cs;
+       priv->freq = slave_plat->max_hz;
+
        _omap3_spi_claim_bus(priv);
 
        return 0;
@@ -601,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;
 }
@@ -635,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;
 }
 
@@ -649,12 +650,10 @@ static int omap3_spi_xfer(struct udevice *dev, unsigned int bitlen,
 
 static int omap3_spi_set_speed(struct udevice *dev, unsigned int speed)
 {
-       struct udevice *bus = dev->parent;
-       struct omap3_spi_priv *priv = dev_get_priv(bus);
-       struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev);
 
-       priv->cs = slave_plat->cs;
-       priv->freq = slave_plat->max_hz;
+       struct omap3_spi_priv *priv = dev_get_priv(dev);
+
+       priv->freq = speed;
        _omap3_spi_set_speed(priv);
 
        return 0;
@@ -662,12 +661,10 @@ static int omap3_spi_set_speed(struct udevice *dev, unsigned int speed)
 
 static int omap3_spi_set_mode(struct udevice *dev, uint mode)
 {
-       struct udevice *bus = dev->parent;
-       struct omap3_spi_priv *priv = dev_get_priv(bus);
-       struct dm_spi_slave_platdata *slave_plat = dev_get_parent_platdata(dev);
+       struct omap3_spi_priv *priv = dev_get_priv(dev);
+
+       priv->mode = mode;
 
-       priv->cs = slave_plat->cs;
-       priv->mode = slave_plat->mode;
        _omap3_spi_set_mode(priv);
 
        return 0;