fpga-manager: altera-ps-spi: enable usage on non-dt platforms

Driver probing fails on non-dt platforms since of_match_device() always returns NULL here. Add device names and matching driver data to the spi_device_id table. This allows driver binding to dynamically added PS-SPI devices (e.g. added via spi_new_device() after hot-plugging).

Signed-off-by Anatolij Gustschin <[email protected]>

---
 drivers/fpga/altera-ps-spi.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

drivers/fpga/altera-ps-spi.c +1 -3

index 14f14efdf0d5..c593f33d8db9 100644
@@ -238,16 +238,25 @@ static int altera_ps_probe(struct spi_device *spi)
 {
        struct altera_ps_conf *conf;
        const struct of_device_id *of_id;
+       const struct spi_device_id *id;
 
        conf = devm_kzalloc(&spi->dev, sizeof(*conf), GFP_KERNEL);
        if (!conf)
                return -ENOMEM;
 
-       of_id = of_match_device(of_ef_match, &spi->dev);
-       if (!of_id)
-               return -ENODEV;

drivers/fpga/altera-ps-spi.c +5 -3

+               conf->data = (struct altera_ps_data *)id->driver_data;
+       }
 
-       conf->data = of_id->data;
        conf->spi = spi;
        conf->config = devm_gpiod_get(&spi->dev, "nconfig", GPIOD_OUT_LOW);
        if (IS_ERR(conf->config)) {

@@ -285,7 +294,9 @@ static int altera_ps_remove(struct spi_device *spi)
 }
 
 static const struct spi_device_id altera_ps_spi_ids[] = {
-       {"cyclone-ps-spi", 0},
+       {"cyclone-ps-spi", (kernel_ulong_t)&c5_data},
+       {"fpga-passive-serial", (kernel_ulong_t)&c5_data},
+       {"fpga-arria10-passive-serial", (kernel_ulong_t)&a10_data},
        {}
 };
 MODULE_DEVICE_TABLE(spi, altera_ps_spi_ids);
--

2.11.0

drivers/fpga/altera-ps-spi.c static int altera_ps_probe(struct spi_device *spi) · line 256

Quoted 10 lines

drivers/fpga/altera-ps-spi.c +10 -0

+       if (spi->dev.of_node) {
+               of_id = of_match_device(of_ef_match, &spi->dev);
+               if (!of_id)
+                       return -ENODEV;
+
+               conf->data = of_id->data;
+       } else {
+               id = spi_get_device_id(spi);
+               if (!id)
+                       return -ENODEV;  

Is it actually possible for !id at this point? Seems like if we are in this probe function and we get this far, this would always succeed.