board: arm: Add support for Broadcom BCM7445

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

diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c
index e06a603ab19e895b88f0a1c74113318371e92426..c517d066f693f44d94fd805308ff8af4b5948a9c 100644 (file)
--- a/drivers/spi/spi-uclass.c
+++ b/drivers/spi/spi-uclass.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2014 Google, Inc
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -50,7 +49,6 @@ int dm_spi_claim_bus(struct udevice *dev)
        struct dm_spi_bus *spi = dev_get_uclass_priv(bus);
        struct spi_slave *slave = dev_get_parent_priv(dev);
        int speed;
-       int ret;
 
        speed = slave->max_hz;
        if (spi->max_hz) {
@@ -62,7 +60,8 @@ int dm_spi_claim_bus(struct udevice *dev)
        if (!speed)
                speed = 100000;
        if (speed != slave->speed) {
-               ret = spi_set_speed_mode(bus, speed, slave->mode);
+               int ret = spi_set_speed_mode(bus, speed, slave->mode);
+
                if (ret)
                        return ret;
                slave->speed = speed;
@@ -129,7 +128,6 @@ static int spi_post_probe(struct udevice *bus)
 #if defined(CONFIG_NEEDS_MANUAL_RELOC)
        struct dm_spi_ops *ops = spi_get_ops(bus);
 
-
        if (ops->claim_bus)
                ops->claim_bus += gd->reloc_off;
        if (ops->release_bus)
@@ -275,7 +273,7 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode,
        bool created = false;
        int ret;
 
-#if CONFIG_IS_ENABLED(OF_PLATDATA)
+#if CONFIG_IS_ENABLED(OF_PLATDATA) || CONFIG_IS_ENABLED(OF_PRIOR_STAGE)
        ret = uclass_first_device_err(UCLASS_SPI, &bus);
 #else
        ret = uclass_get_device_by_seq(UCLASS_SPI, busnum, &bus);
@@ -347,22 +345,6 @@ err:
        return ret;
 }
 
-/* Compatibility function - to be removed */
-struct spi_slave *spi_setup_slave_fdt(const void *blob, int node,
-                                     int bus_node)
-{
-       struct udevice *bus, *dev;
-       int ret;
-
-       ret = uclass_get_device_by_of_offset(UCLASS_SPI, bus_node, &bus);
-       if (ret)
-               return NULL;
-       ret = device_get_child_by_of_offset(bus, node, &dev);
-       if (ret)
-               return NULL;
-       return dev_get_parent_priv(dev);
-}
-
 /* Compatibility function - to be removed */
 struct spi_slave *spi_setup_slave(unsigned int busnum, unsigned int cs,
                                  unsigned int speed, unsigned int mode)