rockchip64: refresh drv-spi-spidev-remove-warnings.patch (#7088)
* rockchip64: edge: refresh drv-spi-spidev-remove-warnings.patch rework to apply cleanly on 6.10.5 * rockchip64: current: refresh drv-spi-spidev-remove-warnings.patch
This commit is contained in:
parent
595ab95a17
commit
63163387c7
@ -1,25 +1,32 @@
|
||||
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[] = {
|
||||
@ -27,6 +34,8 @@ index d13dc15cc191..90d9a33a97bf 100644
|
||||
{ .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
|
||||
|
||||
|
||||
@ -1,25 +1,32 @@
|
||||
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:52:59 +0000
|
||||
Subject: rockchip64: current: 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 b97206d47..d32b3f018 100644
|
||||
--- a/drivers/spi/spidev.c
|
||||
+++ b/drivers/spi/spidev.c
|
||||
@@ -704,6 +704,7 @@ static const struct file_operations spidev_fops = {
|
||||
@@ -702,10 +702,11 @@ 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 = "bh2228fv" },
|
||||
{ .name = "dh2228fv" },
|
||||
{ .name = "ltc2488" },
|
||||
{ .name = "sx1301" },
|
||||
@@ -732,6 +733,7 @@ static int spidev_of_check(struct device *dev)
|
||||
{ .name = "bk4" },
|
||||
@@ -731,10 +732,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[] = {
|
||||
@ -27,6 +34,8 @@ index d13dc15cc191..90d9a33a97bf 100644
|
||||
{ .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
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user