boards: nrf5340dk_nrf5340: Clean up common cpuapp dts node definitions

In commit 619a498, the initialization
of the spi2 node has been moved from the nrf5340_cpuapp_common.dts file
to separate dts files for secure/non-secure targets. That was done
to make the node unavailable in the nRF5340 PDK, that was also using
the common file, because it was non-functional on that board.
For the same reason, the initialization of the usbd node could not
be done in the common file and instead it had to be added separately
for the secure and non-secure targets.
Now that the nRF5340 PDK is no longer supported, there is no point in
keeping such complication. The usbd node initialization is moved to the
common file but the spi2 node initialization is removed and instead the
spi4 node is enabled, as it is labeled as arduino_spi and is assigned
with the same pins.

Signed-off-by: Andrzej Głąbek <[email protected]>

Author: anangl

boards/arm/nrf5340dk_nrf5340/nrf5340_cpuapp_common.dts

@@ -219,6 +219,7 @@ arduino_i2c: &i2c1 {};
 
 arduino_spi: &spi4 {
 	compatible = "nordic,nrf-spim";
+	status = "okay";
 	cs-gpios = <&arduino_header 16 GPIO_ACTIVE_LOW>; /* D10 */
 	pinctrl-0 = <&spi4_default>;
 	pinctrl-1 = <&spi4_sleep>;
@@ -259,6 +260,11 @@ arduino_spi: &spi4 {
 	};
 };
 
+zephyr_udc0: &usbd {
+	compatible = "nordic,nrf-usbd";
+	status = "okay";
+};
+
 / {
 
 	reserved-memory {

boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpuapp-pinctrl.dtsi

@@ -7,7 +7,6 @@
 /dts-v1/;
 #include <nordic/nrf5340_cpuapp_qkaa.dtsi>
 #include "nrf5340_cpuapp_common.dts"
-#include "nrf5340dk_nrf5340_cpuapp-pinctrl.dtsi"
 
 / {
 	model = "Nordic NRF5340 DK NRF5340 Application";
@@ -21,16 +20,3 @@
 		zephyr,sram-non-secure-partition = &sram0_ns;
 	};
 };
-
-&spi2 {
-	compatible = "nordic,nrf-spim";
-	status = "okay";
-	pinctrl-0 = <&spi2_default>;
-	pinctrl-1 = <&spi2_sleep>;
-	pinctrl-names = "default", "sleep";
-};
-
-zephyr_udc0: &usbd {
-	compatible = "nordic,nrf-usbd";
-	status = "okay";
-};

boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpuapp.dts

@@ -18,8 +18,3 @@
 		zephyr,code-partition = &slot0_ns_partition;
 	};
 };
-
-zephyr_udc0: &usbd {
-	compatible = "nordic,nrf-usbd";
-	status = "okay";
-};