spi: spidev: Align ordering of spidev_spi_ids[] and spidev_dt_ids[]

There is a 1:1 correspondance between the list of spi device-ids and the
devicetree compatibles. The latter is ordered alphabetically by vendor
and device. To simplify keeping the two lists in sync, mention the
vendor in a comment for the spi device-ids and order alphabetically,
too.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Link: https://patch.msgid.link/20241217114226.1223724-2-u.kleine-koenig@baylibre.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index 2b87b9ae56c03fc4592b44af9b16f92153e8e360..58ae4304fdab155748e66117f7ceb050da95afed 100644 (file)
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -698,20 +698,24 @@ static const struct class spidev_class = {
        .name = "spidev",
 };
 
+/*
+ * The spi device ids are expected to match the device names of the
+ * spidev_dt_ids array below. Both arrays are kept in the same ordering.
+ */
 static const struct spi_device_id spidev_spi_ids[] = {
-       { .name = "bh2228fv" },
-       { .name = "dh2228fv" },
-       { .name = "jg10309-01" },
-       { .name = "ltc2488" },
-       { .name = "sx1301" },
-       { .name = "bk4" },
-       { .name = "bk4-spi" },
-       { .name = "dhcom-board" },
-       { .name = "m53cpld" },
-       { .name = "spi-petra" },
-       { .name = "spi-authenta" },
-       { .name = "em3581" },
-       { .name = "si3210" },
+       { .name = /* cisco */ "spi-petra" },
+       { .name = /* dh */ "dhcom-board" },
+       { .name = /* elgin */ "jg10309-01" },
+       { .name = /* lineartechnology */ "ltc2488" },
+       { .name = /* lwn */ "bk4" },
+       { .name = /* lwn */ "bk4-spi" },
+       { .name = /* menlo */ "m53cpld" },
+       { .name = /* micron */ "spi-authenta" },
+       { .name = /* rohm */ "bh2228fv" },
+       { .name = /* rohm */ "dh2228fv" },
+       { .name = /* semtech */ "sx1301" },
+       { .name = /* silabs */ "em3581" },
+       { .name = /* silabs */ "si3210" },
        {},
 };
 MODULE_DEVICE_TABLE(spi, spidev_spi_ids);