From 1ffdab4fe47413fca5438afe2c98828c6bb955ea Mon Sep 17 00:00:00 2001 From: Alessandro Lannocca Date: Wed, 14 Aug 2024 04:18:40 +0100 Subject: [PATCH] meson64: current: refresh drv-spi-spidev-remove-warnings.patch rework to apply cleanly on 6.6.46 --- .../drv-spi-spidev-remove-warnings.patch | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/patch/kernel/archive/meson64-6.6/drv-spi-spidev-remove-warnings.patch b/patch/kernel/archive/meson64-6.6/drv-spi-spidev-remove-warnings.patch index 860d6be168..5a1d244525 100644 --- a/patch/kernel/archive/meson64-6.6/drv-spi-spidev-remove-warnings.patch +++ b/patch/kernel/archive/meson64-6.6/drv-spi-spidev-remove-warnings.patch @@ -1,30 +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 +Date: Wed, 14 Aug 2024 16:52:59 +0000 +Subject: rockchip64: current: drv:spi:spidev remove warnings -Remove SPIdev warnings - -- ca478cc4e563655d99fd3380d3b1217481d6da7e: The-going <48602507+The-going@users.noreply.github.com>: 'Bugfix spidev (#3737)' -- e7bd9b8f13af9ee054f44a422b2aca19746b9244: Tony : 'Add Spidev workarounds and clean patches (WIP) (#3812)' -- rpardini: fix for 6.4-rc5 +Signed-off-by: John Doe --- 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[] = { @@ -32,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