build/patch/kernel/archive/sunxi-5.15/patches.armbian/drv-spi-spidev-remove-warnings.patch

48 lines
1.7 KiB
Diff

From 2653defc5e22ba86bd1d455eb01fc7edd2958473 Mon Sep 17 00:00:00 2001
From: The-going <48602507+The-going@users.noreply.github.com>
Date: Wed, 2 Feb 2022 11:56:51 +0300
Subject: [PATCH 08/50] drv:spi:spidev remove warnings
---
drivers/spi/spidev.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index 1bd73e322..bd4e2c185 100644
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -674,6 +674,7 @@ static const struct file_operations spidev_fops = {
static struct class *spidev_class;
static const struct spi_device_id spidev_spi_ids[] = {
+ { .name = "spi-dev" },
{ .name = "dh2228fv" },
{ .name = "ltc2488" },
{ .name = "sx1301" },
@@ -688,6 +689,7 @@ MODULE_DEVICE_TABLE(spi, spidev_spi_ids);
#ifdef CONFIG_OF
static const struct of_device_id spidev_dt_ids[] = {
+ { .compatible = "armbian,spi-dev" },
{ .compatible = "rohm,dh2228fv" },
{ .compatible = "lineartechnology,ltc2488" },
{ .compatible = "semtech,sx1301" },
@@ -750,10 +752,13 @@ 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.
+ * But people don't care and use DT overlays to activate SPIdev
+ * on demand. Armbian has added a compatible string alias "spi-dev"
+ * for this module.
*/
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);
+ "%pOF: buggy DT: spidev listed directly in DT\n\tUse an alias like spi-dev in DT\n", spi->dev.of_node);
spidev_probe_acpi(spi);
--
2.35.3