Adjust patches due to kernel bump

armbian · Oct 1, 2024 · a6cb114 · a6cb114
1 parent f38b5a0
commit a6cb114
Show file tree

Hide file tree

Showing 14 changed files with 6 additions and 5,398 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
@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+rom 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 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
@@ -21,9 +21,9 @@ index b97206d47..d32b3f018 100644
 +	{ .name = "spi-dev" },
  	{ .name = "bh2228fv" },
  	{ .name = "dh2228fv" },
+ 	{ .name = "jg10309-01" },
  	{ .name = "ltc2488" },
  	{ .name = "sx1301" },
- 	{ .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;
@@ -33,9 +33,9 @@ index b97206d47..d32b3f018 100644
 +	{ .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 = "elgin,jg10309-01", .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 },
 -- 
 Created with Armbian build tools https://github.com/armbian/build
 
diff --git a/patch/kernel/archive/rockchip64-6.11/dt/rk3328-heltec.dts b/patch/kernel/archive/rockchip64-6.11/dt/rk3328-heltec.dts