spi: cadence-qspi: Make reset control optional

In the TI am65 device tree files there is no reset defined. Also
the Linux kernel driver uses devm_reset_control_get_optional_exclusive(..)
to get the reset.

Lets do the same as the kernel does and make thr reset optinal.

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>

diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c
index d1b3808c4db9ec60690bb19ecbc9cc84c910ed6d..db680618ee9bb0f54f0857efa240463fd77e6b99 100644 (file)
--- a/drivers/spi/cadence_qspi.c
+++ b/drivers/spi/cadence_qspi.c
@@ -201,11 +201,9 @@ static int cadence_spi_probe(struct udevice *bus)
                }
        }
 
-       ret = reset_get_bulk(bus, &priv->resets);
-       if (ret)
-               dev_warn(bus, "Can't get reset: %d\n", ret);
-       else
-               reset_deassert_bulk(&priv->resets);
+       priv->resets = devm_reset_bulk_get_optional(bus);
+       if (priv->resets)
+               reset_deassert_bulk(priv->resets);
 
        if (!priv->qspi_is_init) {
                cadence_qspi_apb_controller_init(plat);
@@ -220,8 +218,12 @@ static int cadence_spi_probe(struct udevice *bus)
 static int cadence_spi_remove(struct udevice *dev)
 {
        struct cadence_spi_priv *priv = dev_get_priv(dev);
+       int ret = 0;
+
+       if (priv->resets)
+               ret = reset_release_bulk(priv->resets);
 
-       return reset_release_bulk(&priv->resets);
+       return ret;
 }
 
 static int cadence_spi_set_mode(struct udevice *bus, uint mode)

diff --git a/drivers/spi/cadence_qspi.h b/drivers/spi/cadence_qspi.h
index 49b401168fc9dc2fa019155bbac868c5919950a2..19345cac5a04f698c01b5337cdbff9f52e0622ec 100644 (file)
--- a/drivers/spi/cadence_qspi.h
+++ b/drivers/spi/cadence_qspi.h
@@ -56,7 +56,7 @@ struct cadence_spi_priv {
        unsigned int    qspi_calibrated_cs;
        unsigned int    previous_hz;
 
-       struct reset_ctl_bulk resets;
+       struct reset_ctl_bulk *resets;
 };
 
 /* Functions call declaration */