ath10k-ct: remove "qcom,coexist-support" property type hack

The ath10k dt-binding property "qcom,coexist-support" was
explicitly defined as type uint8 since upstream commit
ed09c61eb19d ("dt-bindings: net: Convert ath10k to YAML").
Therefore, this hack patch no longer makes sense.

Link: https://github.com/torvalds/linux/commit/ed09c61eb19d9889780c791cb316ac76468f5186
Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/18393
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/package/kernel/ath10k-ct/Makefile b/package/kernel/ath10k-ct/Makefile
index dfe160244927b02b742f5b1d42bacdd64209fecc..bc7e79c263094c2d71cc2ab1f098813715879921 100644 (file)
--- a/package/kernel/ath10k-ct/Makefile
+++ b/package/kernel/ath10k-ct/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ath10k-ct
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=

diff --git a/package/kernel/ath10k-ct/patches/130-ath10k-read-qcom-coexist-support-as-a-u32.patch b/package/kernel/ath10k-ct/patches/130-ath10k-read-qcom-coexist-support-as-a-u32.patch
deleted file mode 100644 (file)
index 3bc31e0..0000000
--- a/package/kernel/ath10k-ct/patches/130-ath10k-read-qcom-coexist-support-as-a-u32.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 630df9786fdaeb78c21f1e28c9b70ac83a1b482c Mon Sep 17 00:00:00 2001
-From: Vincent Tremblay <vincent@vtremblay.dev>
-Date: Sat, 31 Dec 2022 09:24:00 -0500
-Subject: [PATCH] ath10k: read qcom,coexist-support as a u32
-
-Read qcom,coexist-support as a u32 instead of a u8
-
-When we set the property to <1> in the DT (as specified in the doc),
-"of_property_read_u8" read 0 instead of 1. This is because of the data format. 
-
-By default <1> is written with 32 bits. 
-The problem is that the driver is trying to read a u8.
-
-The difference can be visualized using hexdump in a running device:
-Default 32 bits output:
-=======================
-0000000 0000 0100
-0000004
-
-8 bits output:
-==============
-0000000 0001
-0000001
-
-By changing "of_property_read_u8" by "of_property_read_u32", the driver
-is aligned with the documentation and is able to read the value without
-modifying the DT.
-
-The other solution would be to force the value in the DT to be saved as
-an 8 bits value (qcom,coexist-support = /bits/ 8 <1>), 
-which is against the doc and less intuitive.
-
-Validation:
-===========
-The patch was tested on a real device and we can see in the debug logs
-that the feature is properly initialized:
-
-[  109.102097] ath10k_ahb a000000.wifi: boot coex_support 1 coex_gpio_pin 52
-
-Signed-off-by: Vincent Tremblay <vincent@vtremblay.dev>
-
---- a/ath10k-6.14/core.c
-+++ b/ath10k-6.14/core.c
-@@ -2888,14 +2888,14 @@ done:
- static void ath10k_core_fetch_btcoex_dt(struct ath10k *ar)
- {
-       struct device_node *node;
--      u8 coex_support = 0;
-+      u32 coex_support = 0;
-       int ret;
- 
-       node = ar->dev->of_node;
-       if (!node)
-               goto out;
- 
--      ret = of_property_read_u8(node, "qcom,coexist-support", &coex_support);
-+      ret = of_property_read_u32(node, "qcom,coexist-support", &coex_support);
-       if (ret) {
-               ar->coex_support = true;
-               goto out;