From e6a7d5b5b834737cd12e357b5efdc2e42d923bf6 Mon Sep 17 00:00:00 2001
From: Ben Greear <greearb@candelatech.com>
Date: Wed, 22 Sep 2021 17:05:47 -0700
Subject: [PATCH] ath10k-ct:  Add of_get_mac_address support for 5.15 driver.

---
 ath10k-5.15/core.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ath10k-5.15/core.c b/ath10k-5.15/core.c
index af7d948..644dc10 100644
--- a/ath10k-5.15/core.c
+++ b/ath10k-5.15/core.c
@@ -8,6 +8,7 @@
 #include <linux/module.h>
 #include <linux/firmware.h>
 #include <linux/of.h>
+#include <linux/of_net.h>
 #include <linux/property.h>
 #include <linux/dmi.h>
 #include <linux/ctype.h>
@@ -4042,6 +4043,9 @@ static int ath10k_core_probe_fw(struct ath10k *ar)
 
 	device_get_mac_address(ar->dev, ar->mac_addr, sizeof(ar->mac_addr));
 
+	/* Try to get mac address from device node (from nvmem cell) */
+	of_get_mac_address(ar->dev->of_node, ar->mac_addr);
+
 	ret = ath10k_core_init_firmware_features(ar);
 	if (ret) {
 		ath10k_err(ar, "fatal problem with firmware features: %d\n",