Fixup the SPI device pre-alloc

May the bus is a QSPI, we should check the mode before alloc the SPI
device.

The raw API the SPI mode default but the SPI DM bus probe run before
the SPI mode confirm, we should move the SPI register API alone, then
confirm the bus mode before register.

Signed-off-by: GuEe-GUI <[email protected]>

Author: GuEe-GUI

components/drivers/spi/dev_qspi_core.c

@@ -10,6 +10,10 @@
 
 #include "drivers/dev_spi.h"
 
+extern rt_err_t spi_bus_register(struct rt_spi_bus       *bus,
+                                 const char              *name,
+                                 const struct rt_spi_ops *ops);
+
 rt_err_t rt_qspi_configure(struct rt_qspi_device *device, struct rt_qspi_configuration *cfg)
 {
     RT_ASSERT(device != RT_NULL);
@@ -67,16 +71,10 @@ rt_err_t rt_qspi_configure(struct rt_qspi_device *device, struct rt_qspi_configu
 
 rt_err_t rt_qspi_bus_register(struct rt_spi_bus *bus, const char *name, const struct rt_spi_ops *ops)
 {
-    rt_err_t result = RT_EOK;
+    /* set SPI bus to qspi modes */
+    bus->mode = RT_SPI_BUS_MODE_QSPI;
 
-    result = rt_spi_bus_register(bus, name, ops);
-    if(result == RT_EOK)
-    {
-        /* set SPI bus to qspi modes */
-        bus->mode = RT_SPI_BUS_MODE_QSPI;
-    }
-
-    return result;
+    return spi_bus_register(bus, name, ops);
 }
 
 rt_size_t rt_qspi_transfer_message(struct rt_qspi_device  *device, struct rt_qspi_message *message)

components/drivers/spi/dev_spi_bus.c

@@ -34,7 +34,19 @@ void spi_bus_scan_devices(struct rt_spi_bus *bus)
                 continue;
             }
 
-            spi_dev = rt_calloc(1, sizeof(*spi_dev));
+            if ((bus->mode & RT_SPI_BUS_MODE_SPI) == RT_SPI_BUS_MODE_SPI)
+            {
+                spi_dev = rt_calloc(1, sizeof(struct rt_spi_device));
+            }
+            else if ((bus->mode & RT_SPI_BUS_MODE_QSPI) == RT_SPI_BUS_MODE_QSPI)
+            {
+                spi_dev = rt_calloc(1, sizeof(struct rt_qspi_device));
+            }
+            else
+            {
+                LOG_E("Unknown bus mode = %x", bus->mode);
+                RT_ASSERT(0);
+            }
 
             if (!spi_dev)
             {

components/drivers/spi/dev_spi_core.c

@@ -26,9 +26,9 @@
 extern rt_err_t rt_spi_bus_device_init(struct rt_spi_bus *bus, const char *name);
 extern rt_err_t rt_spidev_device_init(struct rt_spi_device *dev, const char *name);
 
-rt_err_t rt_spi_bus_register(struct rt_spi_bus       *bus,
-                             const char              *name,
-                             const struct rt_spi_ops *ops)
+rt_err_t spi_bus_register(struct rt_spi_bus       *bus,
+                          const char              *name,
+                          const struct rt_spi_ops *ops)
 {
     rt_err_t result;
 
@@ -42,8 +42,6 @@ rt_err_t rt_spi_bus_register(struct rt_spi_bus       *bus,
     bus->ops = ops;
     /* initialize owner */
     bus->owner = RT_NULL;
-    /* set bus mode */
-    bus->mode = RT_SPI_BUS_MODE_SPI;
 
 #ifdef RT_USING_DM
     if (!bus->slave)
@@ -77,6 +75,16 @@ rt_err_t rt_spi_bus_register(struct rt_spi_bus       *bus,
     return RT_EOK;
 }
 
+rt_err_t rt_spi_bus_register(struct rt_spi_bus       *bus,
+                             const char              *name,
+                             const struct rt_spi_ops *ops)
+{
+    /* set bus mode */
+    bus->mode = RT_SPI_BUS_MODE_SPI;
+
+    return spi_bus_register(bus, name, ops);
+}
+
 rt_err_t rt_spi_bus_attach_device_cspin(struct rt_spi_device *device,
                                         const char           *name,
                                         const char           *bus_name,