From 9d4161f8245a81a5e0714e8353651fd7601d127f Mon Sep 17 00:00:00 2001
From: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Date: Tue, 23 Apr 2024 00:12:31 +0530
Subject: [PATCH] shields: Enable SR co-existence only for nRF52 and nRF53
 series SoC's

For nRF91 series SR co-existence isn't applicable as there is no SR.
This saves 4 GPIOs that can be used for other purposes.

This can be done in many ways, but using board specific overlays to
include a common co-ex overlay was chosen because:

* Easier to handle DTS/Kconfig ordering
* In future if each SoC has different pins, easier to use a custom
overlay
* adding a new board it forces to consciously enable the SR co-ex

Fixes SHEL-2708.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
---
 boards/shields/nrf7002eb/boards/nrf52840dk_nrf52840.overlay  | 5 +++++
 .../nrf7002eb/boards/nrf5340dk_nrf5340_cpuapp.overlay        | 5 +++++
 .../shields/nrf7002eb/boards/thingy53_nrf5340_cpuapp.overlay | 2 ++
 boards/shields/nrf7002eb/nrf7002eb.overlay                   | 1 -
 boards/shields/nrf7002ek/boards/nrf52840dk_nrf52840.overlay  | 5 +++++
 .../nrf7002ek/boards/nrf5340dk_nrf5340_cpuapp.overlay        | 1 +
 .../shields/nrf7002ek/boards/thingy53_nrf5340_cpuapp.overlay | 5 +++++
 boards/shields/nrf7002ek/nrf7002ek.overlay                   | 1 -
 .../nrf7002ek_nrf7000/boards/nrf52840dk_nrf52840.overlay     | 5 +++++
 .../boards/nrf5340dk_nrf5340_cpuapp.overlay                  | 1 +
 .../nrf7002ek_nrf7000/boards/thingy53_nrf5340_cpuapp.overlay | 5 +++++
 boards/shields/nrf7002ek_nrf7000/nrf7002ek_nrf7000.overlay   | 1 -
 .../nrf7002ek_nrf7001/boards/nrf52840dk_nrf52840.overlay     | 5 +++++
 .../boards/nrf5340dk_nrf5340_cpuapp.overlay                  | 1 +
 .../nrf7002ek_nrf7001/boards/thingy53_nrf5340_cpuapp.overlay | 5 +++++
 boards/shields/nrf7002ek_nrf7001/nrf7002ek_nrf7001.overlay   | 1 -
 16 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 boards/shields/nrf7002eb/boards/nrf52840dk_nrf52840.overlay
 create mode 100644 boards/shields/nrf7002eb/boards/nrf5340dk_nrf5340_cpuapp.overlay
 create mode 100644 boards/shields/nrf7002ek/boards/nrf52840dk_nrf52840.overlay
 create mode 100644 boards/shields/nrf7002ek/boards/thingy53_nrf5340_cpuapp.overlay
 create mode 100644 boards/shields/nrf7002ek_nrf7000/boards/nrf52840dk_nrf52840.overlay
 create mode 100644 boards/shields/nrf7002ek_nrf7000/boards/thingy53_nrf5340_cpuapp.overlay
 create mode 100644 boards/shields/nrf7002ek_nrf7001/boards/nrf52840dk_nrf52840.overlay
 create mode 100644 boards/shields/nrf7002ek_nrf7001/boards/thingy53_nrf5340_cpuapp.overlay

diff --git a/boards/shields/nrf7002eb/boards/nrf52840dk_nrf52840.overlay b/boards/shields/nrf7002eb/boards/nrf52840dk_nrf52840.overlay
new file mode 100644
index 00000000000..2da9f87a2ad
--- /dev/null
+++ b/boards/shields/nrf7002eb/boards/nrf52840dk_nrf52840.overlay
@@ -0,0 +1,5 @@
+/* Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+ #include "../nrf7002eb_coex.overlay"
diff --git a/boards/shields/nrf7002eb/boards/nrf5340dk_nrf5340_cpuapp.overlay b/boards/shields/nrf7002eb/boards/nrf5340dk_nrf5340_cpuapp.overlay
new file mode 100644
index 00000000000..0beb03e965c
--- /dev/null
+++ b/boards/shields/nrf7002eb/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -0,0 +1,5 @@
+/* Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+#include "../nrf7002eb_coex.overlay"
diff --git a/boards/shields/nrf7002eb/boards/thingy53_nrf5340_cpuapp.overlay b/boards/shields/nrf7002eb/boards/thingy53_nrf5340_cpuapp.overlay
index 3a5e2771ff6..18b934a96ac 100644
--- a/boards/shields/nrf7002eb/boards/thingy53_nrf5340_cpuapp.overlay
+++ b/boards/shields/nrf7002eb/boards/thingy53_nrf5340_cpuapp.overlay
@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
+ #include "../nrf7002eb_coex.overlay"
+
  /* The below overlays might not be explicitly required but still
   * kept here to warn of the conflicting pins that could hamper
   * functionality later
diff --git a/boards/shields/nrf7002eb/nrf7002eb.overlay b/boards/shields/nrf7002eb/nrf7002eb.overlay
index 8181584c0f2..6e72cec73a5 100644
--- a/boards/shields/nrf7002eb/nrf7002eb.overlay
+++ b/boards/shields/nrf7002eb/nrf7002eb.overlay
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 #include <freq.h>
-#include "nrf7002eb_coex.overlay"
 
 / {
         nordic_wlan0: nordic_wlan0 {
diff --git a/boards/shields/nrf7002ek/boards/nrf52840dk_nrf52840.overlay b/boards/shields/nrf7002ek/boards/nrf52840dk_nrf52840.overlay
new file mode 100644
index 00000000000..da54dfdde26
--- /dev/null
+++ b/boards/shields/nrf7002ek/boards/nrf52840dk_nrf52840.overlay
@@ -0,0 +1,5 @@
+/* Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+ #include "../nrf7002ek_coex.overlay"
diff --git a/boards/shields/nrf7002ek/boards/nrf5340dk_nrf5340_cpuapp.overlay b/boards/shields/nrf7002ek/boards/nrf5340dk_nrf5340_cpuapp.overlay
index 66603a7e818..06770a0bc22 100644
--- a/boards/shields/nrf7002ek/boards/nrf5340dk_nrf5340_cpuapp.overlay
+++ b/boards/shields/nrf7002ek/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -2,6 +2,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
+#include "../nrf7002ek_coex.overlay"
 
 /* This node by default forwards the UART1 pins to CPUNET, but as UART1 uses
  * same pins as bucken and iovdd-ctrl, we need these pins to be controlled by
diff --git a/boards/shields/nrf7002ek/boards/thingy53_nrf5340_cpuapp.overlay b/boards/shields/nrf7002ek/boards/thingy53_nrf5340_cpuapp.overlay
new file mode 100644
index 00000000000..da54dfdde26
--- /dev/null
+++ b/boards/shields/nrf7002ek/boards/thingy53_nrf5340_cpuapp.overlay
@@ -0,0 +1,5 @@
+/* Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+ #include "../nrf7002ek_coex.overlay"
diff --git a/boards/shields/nrf7002ek/nrf7002ek.overlay b/boards/shields/nrf7002ek/nrf7002ek.overlay
index e5e03e0ec76..dc34d9245fd 100644
--- a/boards/shields/nrf7002ek/nrf7002ek.overlay
+++ b/boards/shields/nrf7002ek/nrf7002ek.overlay
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 #include <freq.h>
-#include "nrf7002ek_coex.overlay"
 
 / {
 	nordic_wlan0: nordic_wlan0 {
diff --git a/boards/shields/nrf7002ek_nrf7000/boards/nrf52840dk_nrf52840.overlay b/boards/shields/nrf7002ek_nrf7000/boards/nrf52840dk_nrf52840.overlay
new file mode 100644
index 00000000000..89219e71d3a
--- /dev/null
+++ b/boards/shields/nrf7002ek_nrf7000/boards/nrf52840dk_nrf52840.overlay
@@ -0,0 +1,5 @@
+/* Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+ #include "../nrf7002ek_nrf7000_coex.overlay"
diff --git a/boards/shields/nrf7002ek_nrf7000/boards/nrf5340dk_nrf5340_cpuapp.overlay b/boards/shields/nrf7002ek_nrf7000/boards/nrf5340dk_nrf5340_cpuapp.overlay
index 66603a7e818..9d888bd4275 100644
--- a/boards/shields/nrf7002ek_nrf7000/boards/nrf5340dk_nrf5340_cpuapp.overlay
+++ b/boards/shields/nrf7002ek_nrf7000/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -2,6 +2,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
+ #include "../nrf7002ek_nrf7000_coex.overlay"
 
 /* This node by default forwards the UART1 pins to CPUNET, but as UART1 uses
  * same pins as bucken and iovdd-ctrl, we need these pins to be controlled by
diff --git a/boards/shields/nrf7002ek_nrf7000/boards/thingy53_nrf5340_cpuapp.overlay b/boards/shields/nrf7002ek_nrf7000/boards/thingy53_nrf5340_cpuapp.overlay
new file mode 100644
index 00000000000..89219e71d3a
--- /dev/null
+++ b/boards/shields/nrf7002ek_nrf7000/boards/thingy53_nrf5340_cpuapp.overlay
@@ -0,0 +1,5 @@
+/* Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+ #include "../nrf7002ek_nrf7000_coex.overlay"
diff --git a/boards/shields/nrf7002ek_nrf7000/nrf7002ek_nrf7000.overlay b/boards/shields/nrf7002ek_nrf7000/nrf7002ek_nrf7000.overlay
index feb9fd44d72..6c900a68443 100644
--- a/boards/shields/nrf7002ek_nrf7000/nrf7002ek_nrf7000.overlay
+++ b/boards/shields/nrf7002ek_nrf7000/nrf7002ek_nrf7000.overlay
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 #include <freq.h>
-#include "nrf7002ek_nrf7000_coex.overlay"
 
 / {
         nordic_wlan0: nordic_wlan0 {
diff --git a/boards/shields/nrf7002ek_nrf7001/boards/nrf52840dk_nrf52840.overlay b/boards/shields/nrf7002ek_nrf7001/boards/nrf52840dk_nrf52840.overlay
new file mode 100644
index 00000000000..00d734c80d5
--- /dev/null
+++ b/boards/shields/nrf7002ek_nrf7001/boards/nrf52840dk_nrf52840.overlay
@@ -0,0 +1,5 @@
+/* Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+ #include "../nrf7002ek_nrf7001_coex.overlay"
diff --git a/boards/shields/nrf7002ek_nrf7001/boards/nrf5340dk_nrf5340_cpuapp.overlay b/boards/shields/nrf7002ek_nrf7001/boards/nrf5340dk_nrf5340_cpuapp.overlay
index 66603a7e818..eab245fc372 100644
--- a/boards/shields/nrf7002ek_nrf7001/boards/nrf5340dk_nrf5340_cpuapp.overlay
+++ b/boards/shields/nrf7002ek_nrf7001/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -2,6 +2,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
+ #include "../nrf7002ek_nrf7001_coex.overlay"
 
 /* This node by default forwards the UART1 pins to CPUNET, but as UART1 uses
  * same pins as bucken and iovdd-ctrl, we need these pins to be controlled by
diff --git a/boards/shields/nrf7002ek_nrf7001/boards/thingy53_nrf5340_cpuapp.overlay b/boards/shields/nrf7002ek_nrf7001/boards/thingy53_nrf5340_cpuapp.overlay
new file mode 100644
index 00000000000..00d734c80d5
--- /dev/null
+++ b/boards/shields/nrf7002ek_nrf7001/boards/thingy53_nrf5340_cpuapp.overlay
@@ -0,0 +1,5 @@
+/* Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+ #include "../nrf7002ek_nrf7001_coex.overlay"
diff --git a/boards/shields/nrf7002ek_nrf7001/nrf7002ek_nrf7001.overlay b/boards/shields/nrf7002ek_nrf7001/nrf7002ek_nrf7001.overlay
index 7d2810c7926..9722b22bc71 100644
--- a/boards/shields/nrf7002ek_nrf7001/nrf7002ek_nrf7001.overlay
+++ b/boards/shields/nrf7002ek_nrf7001/nrf7002ek_nrf7001.overlay
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 #include <freq.h>
-#include "nrf7002ek_nrf7001_coex.overlay"
 
 / {
         nordic_wlan0: nordic_wlan0 {