treewide: backport support for nvmem on non platform devices

[openwrt/openwrt.git] / package / kernel / mac80211 / patches / ath / 984-ath10k-Try-to-get-mac-address-from-dts.patch

diff --git a/package/kernel/mac80211/patches/ath/984-ath10k-Try-to-get-mac-address-from-dts.patch b/package/kernel/mac80211/patches/ath/984-ath10k-Try-to-get-mac-address-from-dts.patch
deleted file mode 100644 (file)
index d0eb43f..0000000
--- a/package/kernel/mac80211/patches/ath/984-ath10k-Try-to-get-mac-address-from-dts.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 22fb5991a44c78ff18ec0082dc90c809356eb893 Mon Sep 17 00:00:00 2001
-From: Ansuel Smith <ansuelsmth@gmail.com>
-Date: Sun, 27 Sep 2020 19:23:35 +0200
-Subject: [PATCH 1/2] ath10k: Try to get mac-address from dts
-
-Most of embedded device that have the ath10k wifi integrated store the
-mac-address in nvmem partitions. Try to fetch the mac-address using the
-standard 'of_get_mac_address' than in all the check also try to fetch the
-address using the nvmem api searching for a defined 'mac-address' cell.
-Mac-address defined in the dts have priority than any other address found.
-
-Tested-on: QCA9984 hw1.0 PCI 10.4
-
-Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
----
- drivers/net/wireless/ath/ath10k/core.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
-index 5f4e12196..9ed7b9883 100644
---- a/drivers/net/wireless/ath/ath10k/core.c
-+++ b/drivers/net/wireless/ath/ath10k/core.c
-@@ -8,6 +8,9 @@
- #include <linux/module.h>
- #include <linux/firmware.h>
- #include <linux/of.h>
-+#include <linux/of_net.h>
-+#include <linux/of_platform.h>
-+#include <linux/property.h>
- #include <linux/property.h>
- #include <linux/dmi.h>
- #include <linux/ctype.h>
-@@ -2961,8 +2963,14 @@ EXPORT_SYMBOL(ath10k_core_stop);
- static int ath10k_core_probe_fw(struct ath10k *ar)
- {
-       struct bmi_target_info target_info;
-+      const char *mac;
-       int ret = 0;
- 
-+#ifdef CONFIG_OF
-+      /* register the platform to be found by the of api */
-+      of_platform_device_create(ar->dev->of_node, NULL, NULL);
-+#endif
-+
-       ret = ath10k_hif_power_up(ar, ATH10K_FIRMWARE_MODE_NORMAL);
-       if (ret) {
-               ath10k_err(ar, "could not power on hif bus (%d)\n", ret);
-@@ -3062,6 +3068,10 @@ static int ath10k_core_probe_fw(struct ath10k *ar)
- 
-       device_get_mac_address(ar->dev, ar->mac_addr, sizeof(ar->mac_addr));
- 
-+      mac = of_get_mac_address(ar->dev->of_node);
-+      if (!IS_ERR(mac))
-+              ether_addr_copy(ar->mac_addr, mac);
-+
-       ret = ath10k_core_init_firmware_features(ar);
-       if (ret) {
-               ath10k_err(ar, "fatal problem with firmware features: %d\n",
--- 
-2.27.0
-