Skip to content

Commit

Permalink
meson64: edge: refresh drv-spi-spidev-remove-warnings.patch
Browse files Browse the repository at this point in the history
rework to apply cleanly on 6.10.5
  • Loading branch information
alexl83 authored and pyavitz committed Aug 14, 2024
1 parent 1ffdab4 commit 134ae29
Showing 1 changed file with 16 additions and 12 deletions.
Original file line number Diff line number Diff line change
@@ -1,37 +1,41 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: The-going <[email protected]>
Date: Wed, 2 Feb 2022 11:56:51 +0300
Subject: drv:spi:spidev remove warnings
From: John Doe <[email protected]>
Date: Wed, 14 Aug 2024 16:33:07 +0000
Subject: rockchip64: edge: 6.10.5 drv:spi:spidev remove warnings

Remove SPIdev warnings

- ca478cc4e563655d99fd3380d3b1217481d6da7e: The-going <[email protected]>: 'Bugfix spidev (#3737)'
- e7bd9b8f13af9ee054f44a422b2aca19746b9244: Tony <[email protected]>: 'Add Spidev workarounds and clean patches (WIP) (#3812)'
- rpardini: fix for 6.4-rc5
Signed-off-by: John Doe <[email protected]>
---
drivers/spi/spidev.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index 111111111111..222222222222 100644
index 5304728c6..64c4280de 100644
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -700,6 +700,7 @@ static const 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" },
@@ -728,6 +729,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

0 comments on commit 134ae29

Please sign in to comment.