fix: update from upstream

See https://github.com/nrfconnect/sdk-nrf/tree/ec67e6ca4fa531bf78589713a5ae8ef592369dfb/applications/asset_tracker_v2
NordicSemiconductor · Jul 4, 2023 · e5b1335 · e5b1335
1 parent f1cda8c
commit e5b1335
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 51 deletions.
diff --git a/boards/nrf9160dk_nrf9160_ns.overlay b/boards/nrf9160dk_nrf9160_ns.overlay
@@ -42,10 +42,3 @@
 		};
 	};
 };
-
-/* Enable high drive mode for the SPI3 pins to get a square signal at 8 MHz */
-&spi3_default {
-	group1 {
-		nordic,drive-mode = <NRF_DRIVE_H0H1>;
-	};
-};
diff --git a/boards/nrf9161dk_nrf9161_ns.overlay b/boards/nrf9161dk_nrf9161_ns.overlay
@@ -48,13 +48,6 @@
 	};
 };
 
-/* Enable high drive mode for the SPI3 pins to get a square signal at 8 MHz */
-&spi3_default {
-	group1 {
-		nordic,drive-mode = <NRF_DRIVE_H0H1>;
-	};
-};
-
 &gd25lb256 {
 	status = "okay";
 };
diff --git a/child_image/mcuboot/boards/nrf9160dk_nrf9160_0_14_0.overlay b/child_image/mcuboot/boards/nrf9160dk_nrf9160_0_14_0.overlay
@@ -4,13 +4,6 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-/* Enable high drive mode for the SPI3 pins to get a square signal at 8 MHz */
-&spi3_default {
-	group1 {
-		nordic,drive-mode = <NRF_DRIVE_H0H1>;
-	};
-};
-
 &mx25r64 {
 	status = "okay";
 };

diff --git a/child_image/mcuboot/boards/nrf9161dk_nrf9161.overlay b/child_image/mcuboot/boards/nrf9161dk_nrf9161.overlay
@@ -4,13 +4,6 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-/* Enable high drive mode for the SPI3 pins to get a square signal at 8 MHz */
-&spi3_default {
-	group1 {
-		nordic,drive-mode = <NRF_DRIVE_H0H1>;
-	};
-};
-
 &gd25lb256 {
 	status = "okay";
 };

diff --git a/nrf9160dk_with_ext_flash.overlay b/nrf9160dk_with_ext_flash.overlay
@@ -27,13 +27,6 @@
 	};
 };
 
-/* Enable high drive mode for the SPI3 pins to get a square signal at 8 MHz */
-&spi3_default {
-	group1 {
-		nordic,drive-mode = <NRF_DRIVE_H0H1>;
-	};
-};
-
 / {
 	aliases {
 		ext-flash = &mx25r64;

diff --git a/nrf9161dk_with_ext_flash.overlay b/nrf9161dk_with_ext_flash.overlay
@@ -30,13 +30,6 @@
 	};
 };
 
-/* Enable high drive mode for the SPI3 pins to get a square signal at 8 MHz */
-&spi3_default {
-	group1 {
-		nordic,drive-mode = <NRF_DRIVE_H0H1>;
-	};
-};
-
 / {
 	aliases {
 		ext-flash = &gd25lb256;

diff --git a/nrf91xxdk_with_nrf7002ek.overlay b/nrf91xxdk_with_nrf7002ek.overlay
@@ -4,14 +4,6 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-/* Use high drive mode on SPI pins that handle communication with nRF7002
- * so that SCK frequency > 4 MHz can be used. */
- &spi3_default {
-	group1 {
-		nordic,drive-mode = <NRF_DRIVE_H0H1>;
-	};
-};
-
 /* Disabled because of conflicts on P0.00 and P0.01 - Arduino pins D0 and D1
  * (iovdd-ctrl-gpios and bucken-gpios in nrf7002ek, respectively). */
 &uart1 {

diff --git a/sample.yaml b/sample.yaml
@@ -198,7 +198,7 @@ tests:
       - nrf9160dk_nrf9160_ns
     platform_allow: nrf9160dk_nrf9160_ns
     extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf
-                DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay"
+                DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay;nrf9160dk_with_ext_flash.overlay"
     tags: ci_build
   applications.asset_tracker_v2.nrf7002ek_wifi.nrf9161dk:
     build_only: true