-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refresh drv-spi-spidev-remove-warnings.patch
rework to apply cleanly on 6.10.5
- Loading branch information
Showing
1 changed file
with
17 additions
and
8 deletions.
There are no files selected for viewing
25 changes: 17 additions & 8 deletions
25
patch/kernel/archive/rockchip64-6.10/drv-spi-spidev-remove-warnings.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,32 +1,41 @@ | ||
From 0000000000000000000000000000000000000000 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: drv:spi:spidev remove warnings | ||
From: John Doe <john.doe@somewhere.on.planet> | ||
Date: Wed, 14 Aug 2024 16:33:07 +0000 | ||
Subject: rockchip64: edge: 6.10.5 drv:spi:spidev remove warnings | ||
|
||
Signed-off-by: John Doe <john.doe@somewhere.on.planet> | ||
--- | ||
drivers/spi/spidev.c | 2 ++ | ||
1 file changed, 2 insertions(+) | ||
|
||
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c | ||
index d13dc15cc191..90d9a33a97bf 100644 | ||
index 5304728c6..64c4280de 100644 | ||
--- a/drivers/spi/spidev.c | ||
+++ b/drivers/spi/spidev.c | ||
@@ -704,6 +704,7 @@ static const struct file_operations spidev_fops = { | ||
static struct class *spidev_class; | ||
@@ -698,10 +698,11 @@ static const struct file_operations spidev_fops = { | ||
static const struct class spidev_class = { | ||
.name = "spidev", | ||
}; | ||
|
||
static const struct spi_device_id spidev_spi_ids[] = { | ||
+ { .name = "spi-dev" }, | ||
{ .name = "bh2228fv" }, | ||
{ .name = "dh2228fv" }, | ||
{ .name = "ltc2488" }, | ||
{ .name = "sx1301" }, | ||
@@ -732,6 +733,7 @@ static int spidev_of_check(struct device *dev) | ||
{ .name = "bk4" }, | ||
@@ -727,10 +728,11 @@ static int spidev_of_check(struct device *dev) | ||
dev_err(dev, "spidev listed directly in DT is not supported\n"); | ||
return -EINVAL; | ||
} | ||
|
||
static const struct of_device_id spidev_dt_ids[] = { | ||
+ { .compatible = "armbian,spi-dev", .data = &spidev_of_check }, | ||
{ .compatible = "cisco,spi-petra", .data = &spidev_of_check }, | ||
{ .compatible = "dh,dhcom-board", .data = &spidev_of_check }, | ||
{ .compatible = "lineartechnology,ltc2488", .data = &spidev_of_check }, | ||
{ .compatible = "lwn,bk4", .data = &spidev_of_check }, | ||
{ .compatible = "menlo,m53cpld", .data = &spidev_of_check }, | ||
-- | ||
Armbian | ||
Created with Armbian build tools https://github.com/armbian/build | ||
|