spi: omap3: Skip set_mode, set_speed from claim
authorJagan Teki <jagan@amarulasolutions.com>
Wed, 7 Mar 2018 05:00:45 +0000 (10:30 +0530)
committerJagan Teki <jagan@amarulasolutions.com>
Tue, 13 Mar 2018 14:20:10 +0000 (19:50 +0530)
set_mode, set_seed functions has separate function pointers
in dm_spi_ops, so use them in relevent one instead of
calling from claim_bus.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
drivers/spi/omap3_spi.c

index 1da4542..b8a0bf4 100644 (file)
@@ -456,9 +456,6 @@ static void _omap3_spi_claim_bus(struct omap3_spi_priv *priv)
        conf |= OMAP3_MCSPI_MODULCTRL_SINGLE;
 
        writel(conf, &priv->regs->modulctrl);
-
-       _omap3_spi_set_mode(priv);
-       _omap3_spi_set_speed(priv);
 }
 
 #ifndef CONFIG_DM_SPI
@@ -594,8 +591,6 @@ 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->mode = slave_plat->mode;
-       priv->freq = slave_plat->max_hz;
        _omap3_spi_claim_bus(priv);
 
        return 0;
@@ -652,11 +647,27 @@ static int omap3_spi_xfer(struct udevice *dev, unsigned int bitlen,
 
 static int omap3_spi_set_speed(struct udevice *bus, 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;
+       _omap3_spi_set_speed(priv);
+
        return 0;
 }
 
 static int omap3_spi_set_mode(struct udevice *bus, 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);
+
+       priv->cs = slave_plat->cs;
+       priv->mode = slave_plat->mode;
+       _omap3_spi_set_mode(priv);
+
        return 0;
 }