switch to 5.4.y

This commit is contained in:
Martin Ayotte 2019-11-25 19:51:06 -05:00
parent 1a4c152fc6
commit aafb70a9a3
189 changed files with 1212088 additions and 222 deletions

View file

@ -0,0 +1,22 @@
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index b0c76e262..c56f6dc4c 100644
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -722,12 +722,12 @@ static int spidev_probe(struct spi_device *spi)
/*
* spidev should never be referenced in DT without a specific
- * compatible string, it is a Linux implementation thing
- * rather than a description of the hardware.
+ * compatible string, but people don't care and use DT overlays
+ * to activate SPIdev on demand
*/
- WARN(spi->dev.of_node &&
- of_device_is_compatible(spi->dev.of_node, "spidev"),
- "%pOF: buggy DT: spidev listed directly in DT\n", spi->dev.of_node);
+ if (spi->dev.of_node && !of_match_device(spidev_dt_ids, &spi->dev)) {
+ dev_info(&spi->dev, "probing from DT");
+ }
spidev_probe_acpi(spi);