From 340af35325786e818abda040051a0442a9d3f0b8 Mon Sep 17 00:00:00 2001
From: Dick Marinus <dick@mrns.nl>
Date: Apr 19 2021 19:29:50 +0000
Subject: update patch


---

diff --git a/0001-Support-for-Kernel-5.10-from-Ecos-hj.patch b/0001-Support-for-Kernel-5.10-from-Ecos-hj.patch
deleted file mode 100644
index 0a8ade1..0000000
--- a/0001-Support-for-Kernel-5.10-from-Ecos-hj.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From f5da095080b1d525b004d0fd6a0d669fb345775c Mon Sep 17 00:00:00 2001
-From: Dick Marinus <dick@mrns.nl>
-Date: Sun, 18 Apr 2021 21:29:51 +0200
-Subject: [PATCH] Support for Kernel 5.10 (from Ecos-hj)
-
----
- apple-ib-als.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/apple-ib-als.c b/apple-ib-als.c
-index 6c2949d..59ff38f 100644
---- a/apple-ib-als.c
-+++ b/apple-ib-als.c
-@@ -37,6 +37,7 @@
- #include <linux/module.h>
- #include <linux/platform_device.h>
- #include <linux/slab.h>
-+#include <linux/version.h>
- 
- #include "apple-ibridge.h"
- 
-@@ -460,7 +461,12 @@ static int appleals_config_iio(struct appleals_device *als_dev)
- 	struct appleals_device **priv;
- 	int rc;
- 
--	iio_dev = iio_device_alloc(sizeof(als_dev));
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
-+        iio_dev = iio_device_alloc(sizeof(als_dev));
-+#else
-+        iio_dev = iio_device_alloc(&als_dev->hid_dev->dev, sizeof(als_dev));
-+#endif
-+
- 	if (!iio_dev)
- 		return -ENOMEM;
- 
--- 
-2.30.2
-
diff --git a/55.patch b/55.patch
new file mode 100644
index 0000000..2ac42b7
--- /dev/null
+++ b/55.patch
@@ -0,0 +1,35 @@
+diff --git a/apple-ib-als.c b/apple-ib-als.c
+index 6c2949d..e752c62 100644
+--- a/apple-ib-als.c
++++ b/apple-ib-als.c
+@@ -37,6 +37,7 @@
+ #include <linux/module.h>
+ #include <linux/platform_device.h>
+ #include <linux/slab.h>
++#include <linux/version.h>
+ 
+ #include "apple-ibridge.h"
+ 
+@@ -459,8 +460,11 @@ static int appleals_config_iio(struct appleals_device *als_dev)
+ 	struct iio_trigger *iio_trig;
+ 	struct appleals_device **priv;
+ 	int rc;
+-
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
+ 	iio_dev = iio_device_alloc(sizeof(als_dev));
++#else
++	iio_dev = iio_device_alloc(&als_dev->hid_dev->dev, sizeof(als_dev));
++#endif
+ 	if (!iio_dev)
+ 		return -ENOMEM;
+ 
+@@ -469,7 +473,9 @@ static int appleals_config_iio(struct appleals_device *als_dev)
+ 
+ 	iio_dev->channels = appleals_channels;
+ 	iio_dev->num_channels = ARRAY_SIZE(appleals_channels);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0)
+ 	iio_dev->dev.parent = &als_dev->hid_dev->dev;
++#endif
+ 	iio_dev->info = &appleals_info;
+ 	iio_dev->name = "als";
+ 	iio_dev->modes = INDIO_DIRECT_MODE;
diff --git a/macbook12-spi-driver-kmod.spec b/macbook12-spi-driver-kmod.spec
index 75e3836..ce36049 100644
--- a/macbook12-spi-driver-kmod.spec
+++ b/macbook12-spi-driver-kmod.spec
@@ -8,7 +8,8 @@ Summary: Akmod package for macbook12-spi-driver
 License: GPL-2.0
 URL: https://github.com/roadrunner2/macbook12-spi-driver
 Source: https://github.com/roadrunner2/macbook12-spi-driver/archive/%{githash}.tar.gz
-Patch: 0001-Support-for-Kernel-5.10-from-Ecos-hj.patch
+# https://patch-diff.githubusercontent.com/raw/roadrunner2/macbook12-spi-driver/pull/55.diff
+Patch: 55.patch
 
 BuildRequires:  %{_bindir}/kmodtool gcc
 Provides: macbook12-spi-driver-kmod-common