Revert "[nrf fromtree] soc: nordic: Introduce the nRF54L05 and nRF54L10"

This reverts commit 29e1f33.

Signed-off-by: Gerard Marull-Paretas <[email protected]>

Author: gmarull

drivers/adc/adc_nrfx_saadc.c

@@ -31,7 +31,7 @@ static const uint8_t saadc_psels[NRF_SAADC_AIN7 + 1] = {
 	[NRF_SAADC_AIN6] = NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),
 	[NRF_SAADC_AIN7] = NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1),
 };
-#elif defined(CONFIG_SOC_NRF54L05) || defined(CONFIG_SOC_NRF54L10) || defined(CONFIG_SOC_NRF54L15)
+#elif defined(CONFIG_SOC_NRF54L15)
 static const uint32_t saadc_psels[NRF_SAADC_DVDD + 1] = {
 	[NRF_SAADC_AIN0] = NRF_PIN_PORT_TO_PIN_NUMBER(4U, 1),
 	[NRF_SAADC_AIN1] = NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
@@ -667,7 +667,7 @@ static const struct adc_driver_api adc_nrfx_driver_api = {
 #ifdef CONFIG_ADC_ASYNC
 	.read_async    = adc_nrfx_read_async,
 #endif
-#if defined(CONFIG_SOC_NRF54L05) || defined(CONFIG_SOC_NRF54L10) ||  defined(CONFIG_SOC_NRF54L15)
+#if defined(CONFIG_SOC_NRF54L15)
 	.ref_internal  = 900,
 #elif defined(CONFIG_NRF_PLATFORM_HALTIUM)
 	.ref_internal  = 1024,

drivers/comparator/comparator_nrf_comp.c

@@ -78,7 +78,7 @@ static const uint32_t shim_nrf_comp_ain_map[] = {
 	NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
 	NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),
 	NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1),
-#elif defined(CONFIG_SOC_NRF54L05) || defined(CONFIG_SOC_NRF54L10) || defined(CONFIG_SOC_NRF54L15)
+#elif defined(CONFIG_SOC_NRF54L15)
 	NRF_PIN_PORT_TO_PIN_NUMBER(4U, 1),
 	NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
 	NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),

drivers/comparator/comparator_nrf_lpcomp.c

@@ -49,7 +49,7 @@ static const uint32_t shim_nrf_lpcomp_ain_map[] = {
 	NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
 	NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),
 	NRF_PIN_PORT_TO_PIN_NUMBER(7U, 1),
-#elif defined(CONFIG_SOC_NRF54L05) || defined(CONFIG_SOC_NRF54L10) ||  defined(CONFIG_SOC_NRF54L15)
+#elif defined(CONFIG_SOC_NRF54L15)
 	NRF_PIN_PORT_TO_PIN_NUMBER(4U, 1),
 	NRF_PIN_PORT_TO_PIN_NUMBER(5U, 1),
 	NRF_PIN_PORT_TO_PIN_NUMBER(6U, 1),

drivers/misc/nordic_vpr_launcher/nordic_vpr_launcher.c

@@ -14,7 +14,7 @@
 #include <zephyr/toolchain.h>
 
 #include <hal/nrf_vpr.h>
-#if defined(CONFIG_SOC_NRF54L_CPUAPP_COMMON) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
+#if defined(CONFIG_SOC_NRF54L15_CPUAPP) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
 #include <hal/nrf_spu.h>
 #endif
 
@@ -41,7 +41,7 @@ static int nordic_vpr_launcher_init(const struct device *dev)
 	}
 #endif
 
-#if defined(CONFIG_SOC_NRF54L_CPUAPP_COMMON) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
+#if defined(CONFIG_SOC_NRF54L15_CPUAPP) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
 	nrf_spu_periph_perm_secattr_set(NRF_SPU00, nrf_address_slave_get((uint32_t)config->vpr),
 					true);
 #endif

dts/arm/nordic/nrf54l05_cpuapp.dtsi

@@ -5,4 +5,84 @@
  */
 
 #include <nordic/nrf54l15.dtsi>
-#include "nrf54l_05_10_15_cpuapp.dtsi"
+
+cpu: &cpuapp {};
+systick: &cpuapp_systick {};
+nvic: &cpuapp_nvic {};
+
+/delete-node/ &cpuflpr;
+/delete-node/ &cpuflpr_rram;
+/delete-node/ &cpuflpr_sram;
+/delete-node/ &cpuflpr_clic;
+
+/ {
+	chosen {
+		zephyr,bt-hci = &bt_hci_controller;
+	};
+
+	soc {
+		compatible = "simple-bus";
+		interrupt-parent = <&cpuapp_nvic>;
+		ranges;
+	};
+
+	psa_rng: psa-rng {
+		compatible = "zephyr,psa-crypto-rng";
+		status = "disabled";
+	};
+};
+
+&bt_hci_controller {
+	status = "okay";
+};
+
+&cpuflpr_vpr {
+	cpuapp_vevif_rx: mailbox@1 {
+		compatible = "nordic,nrf-vevif-event-rx";
+		reg = <0x0 0x1000>;
+		status = "disabled";
+		interrupts = <76 NRF_DEFAULT_IRQ_PRIORITY>;
+		#mbox-cells = <1>;
+		nordic,events = <1>;
+		nordic,events-mask = <0x00100000>;
+	};
+
+	cpuapp_vevif_tx: mailbox@0 {
+		compatible = "nordic,nrf-vevif-task-tx";
+		reg = <0x0 0x1000>;
+		#mbox-cells = <1>;
+		nordic,tasks = <7>;
+		nordic,tasks-mask = <0x007f0000>;
+		status = "disabled";
+	};
+};
+
+&cpuapp_ppb {
+	compatible = "simple-bus";
+	ranges;
+};
+
+&grtc {
+#ifdef USE_NON_SECURE_ADDRESS_MAP
+	interrupts = <227 NRF_DEFAULT_IRQ_PRIORITY>,
+#else
+	interrupts = <228 NRF_DEFAULT_IRQ_PRIORITY>,
+#endif
+		<229 NRF_DEFAULT_IRQ_PRIORITY>; /* reserved for Zero Latency IRQs */
+};
+
+&gpiote20 {
+#ifdef USE_NON_SECURE_ADDRESS_MAP
+	interrupts = <218 NRF_DEFAULT_IRQ_PRIORITY>;
+#else
+	interrupts = <219 NRF_DEFAULT_IRQ_PRIORITY>;
+#endif
+};
+
+&gpiote30 {
+#ifdef USE_NON_SECURE_ADDRESS_MAP
+	interrupts = <268 NRF_DEFAULT_IRQ_PRIORITY>;
+#else
+	interrupts = <269 NRF_DEFAULT_IRQ_PRIORITY>;
+#endif
+};